bugfix concerning --exec_prefix see firmlower commit

[r559]

diff --git a/MakeRules.in b/MakeRules.in
index d10594c..abd79c9 100644 (file)
--- a/MakeRules.in
+++ b/MakeRules.in
@@ -12,10 +12,13 @@ LIBFIRM_VERSION = @PACKAGE_VERSION@
 CC = @CC@
 CFLAGS := @CFLAGS@
 CPPFLAGS := -I. -I$(topdir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
-
+prefix?=@prefix@
+exec_prefix?=@exec_prefix@
+includedir?=@includedir@
+libdir?=@libdir@
 INSTALL = @INSTALL@
-INCLUDEDIR = @prefix@/@includedir@
-LIBDIR = @exec_prefix@/@libdir@
+INCLUDEDIR ?= ${prefix}/${includedir}/${PACKAGE_NAME}
+LIBDIR ?= ${exec_prefix}/${libdir}
 PACKAGE_NAME = @PACKAGE_NAME@
 
 DEFS = @DEFS@

diff --git a/MakeTargets b/MakeTargets
index b553804..855a382 100644 (file)
--- a/MakeTargets
+++ b/MakeTargets
@@ -74,12 +74,12 @@ local_tags: $(TAGFILES)
        etags -C $^
 
 # installation
-install:       $(INCLUDEDIR)/$(PACKAGE_NAME) install_headers $(LIBDIR) install_libs
+install:       $(INCLUDEDIR) install_headers $(LIBDIR) install_libs
 
 install_headers:       subdir_install_headers local_install_headers
 local_install_headers:
 ifneq ($(strip $(INSTALL_HEADERS)),)
-       $(INSTALL) -C -m u+rw,a+r $(addprefix $(srcdir)/,$(INSTALL_HEADERS)) $(INCLUDEDIR)/$(PACKAGE_NAME)
+       $(INSTALL) -C -m u+rw,a+r $(addprefix $(srcdir)/,$(INSTALL_HEADERS)) $(INCLUDEDIR)
 endif
 
 install_libs:          subdir_install_libs local_install_libs
@@ -89,10 +89,10 @@ ifneq ($(strip $(INSTALL_LIBS)),)
 endif
 
 
-$(LIBDIR):     $(LIBDIR)
+$(LIBDIR):
        mkdir -p $@
 
-$(INCLUDEDIR)/$(PACKAGE_NAME): $(INCLUDEDIR)/$(PACKAGE_NAME)
+$(INCLUDEDIR):
        mkdir -p $@
 
 # generated the directory where all the generated documentation is