diff options
| author | Steve Bennett <steveb@workware.net.au> | 2013-06-12 11:43:52 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2013-06-12 11:50:24 +1000 |
| commit | 5ca6b7ff651246cec3a09a94fda36dc5872fa759 (patch) | |
| tree | b6ac27133f5e5698b356b601b431ed0844617615 /Makefile.in | |
| parent | 30627b40f56e04becf37ba9a1799a8a944e10f9f (diff) | |
| download | jimtcl-5ca6b7ff651246cec3a09a94fda36dc5872fa759.zip jimtcl-5ca6b7ff651246cec3a09a94fda36dc5872fa759.tar.gz jimtcl-5ca6b7ff651246cec3a09a94fda36dc5872fa759.tar.bz2 | |
Fix hardcoded install paths
Many path inside the makefile are hardcoded, replace them with the
appropriate variables. (Main purpose: '$prefix/lib' is simply wrong
on 64bit systems).
Reported-by: Markus Mayer <lotharlutz@gmx.de>
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index 01eba5d..b95b581 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,28 +74,28 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o @if JIM_INSTALL install: all @TCL_EXTS@ install-exec install-docs - mkdir -p $(DESTDIR)$(prefix)/lib/jim - cp $(LIBJIM) $(DESTDIR)$(prefix)/lib - cp @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)$(prefix)/lib/jim - for i in @TCL_EXTS@; do cp @srcdir@/$$i $(DESTDIR)$(prefix)/lib/jim; done - mkdir -p $(DESTDIR)$(prefix)/include + mkdir -p $(DESTDIR)@libdir@/jim + cp $(LIBJIM) $(DESTDIR)@libdir@ + cp @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@libdir@/jim + for i in @TCL_EXTS@; do cp @srcdir@/$$i $(DESTDIR)@libdir@/jim; done + mkdir -p $(DESTDIR)@includedir@ cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \ - @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)$(prefix)/include - cp jim-config.h $(DESTDIR)$(prefix)/include - mkdir -p $(DESTDIR)$(prefix)/bin - cp build-jim-ext $(DESTDIR)$(prefix)/bin + @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)@includedir@ + cp jim-config.h $(DESTDIR)@includedir@ + mkdir -p $(DESTDIR)@bindir@ + cp build-jim-ext $(DESTDIR)@bindir@ install-exec: all - mkdir -p $(DESTDIR)$(prefix)/bin - cp $(JIMSH) $(DESTDIR)$(prefix)/bin + mkdir -p $(DESTDIR)@bindir@ + cp $(JIMSH) $(DESTDIR)@bindir@ uninstall: - rm -f $(DESTDIR)$(prefix)/bin/$(JIMSH) - rm -f $(DESTDIR)$(prefix)/bin/build-jim-ext - rm -f $(DESTDIR)$(prefix)/lib/$(LIBJIM) - for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)$(prefix)/lib/jim/$$i; done - rm -f $(DESTDIR)$(prefix)/include/jim*.h - rm -f $(DESTDIR)$(prefix)/doc/jim/Tcl.html + rm -f $(DESTDIR)@bindir@/$(JIMSH) + rm -f $(DESTDIR)@bindir@/build-jim-ext + rm -f $(DESTDIR)@libdir@/$(LIBJIM) + for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@libdir@/jim/$$i; done + rm -f $(DESTDIR)@includedir@/jim*.h + rm -f $(DESTDIR)@datadir@/doc/jim/Tcl.html @else install install-exec: all uninstall: |