cleaned up makefiles

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@625 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/link/z80/Makefile.in b/link/z80/Makefile.in
index 911077f435e362d3ab9d0030834a0a36930b8c64..7ffd5ba025ca004ed13fd0cabe92bf4f8a858e08 100644 (file)
--- a/link/z80/Makefile.in
+++ b/link/z80/Makefile.in
@@ -16,15 +16,15 @@ PRJDIR              = ../..
 
 srcdir         = @srcdir@
 prefix         = @prefix@
-exec_prefix     = ${prefix}
-bindir          = ${exec_prefix}/bin
-libdir          = ${exec_prefix}/lib
-datadir         = ${prefix}/share
-includedir      = ${prefix}/include
-mandir          = ${prefix}/man
+exec_prefix     = @exec_prefix@
+bindir          = @bindir@
+libdir          = @libdir@
+datadir         = @datadir@
+includedir      = @includedir@
+mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
-infodir         = ${prefix}/info
+infodir         = @infodir@
 
 SLIB   =$(PRJDIR)/support/Util
 

diff --git a/support/cpp/Makefile.in b/support/cpp/Makefile.in
index 21191d2b20c37a4c3dcb34c31f104fa1b038d402..68f0c167cd850759aa3c12222a8f86e23f0919cb 100644 (file)
--- a/support/cpp/Makefile.in
+++ b/support/cpp/Makefile.in
@@ -20,15 +20,15 @@ PRJDIR              = ../..
 
 srcdir         = @srcdir@
 prefix         = @prefix@
-exec_prefix     = ${prefix}
-bindir          = ${exec_prefix}/bin
-libdir          = ${exec_prefix}/lib
-datadir         = ${prefix}/share
-includedir      = ${prefix}/include
-mandir          = ${prefix}/man
+exec_prefix     = @exec_prefix@
+bindir          = @bindir@
+libdir          = @libdir@
+datadir         = @datadir@
+includedir      = @includedir@
+mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
-infodir         = ${prefix}/info
+infodir         = @infodir@
 
 STD_INC                = @sdcc_include_dir@
 CPPFLAGS       = @CPPFLAGS@ -I. -I$(PRJDIR) -I$(SLIB) -D_FORASXXXX_