From 1852c574ca75a0761a795fae5a2a8062fbb2fe4f Mon Sep 17 00:00:00 2001 From: posophe Date: Fri, 23 Jan 2015 11:44:28 +0100 Subject: [PATCH 1/4] Fix DESTDIR in Makefile.in --- Makefile.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 07a67d4..86d7459 100644 --- a/Makefile.in +++ b/Makefile.in @@ -65,9 +65,13 @@ install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) $(STRIP)' install installdirs: - $(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \ + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(sysconfdir); \ if test "x$(ELISP)" != "x" ; then \ - $(MKDIR) $(lispdir) ; \ + $(MKDIR) $(DESTDIR)$(lispdir) ; \ fi ### GENERIC From 25e9deea5d8559a93f338044877c7c54e02eac5b Mon Sep 17 00:00:00 2001 From: posophe Date: Fri, 23 Jan 2015 11:45:15 +0100 Subject: [PATCH 2/4] Fix DESTDIR in Makefile.include.in --- Makefile.include.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.include.in b/Makefile.include.in index 6382bba..9b9b2b5 100644 --- a/Makefile.include.in +++ b/Makefile.include.in @@ -43,6 +43,7 @@ YACC = @YACC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL@ -d LN_S = @LN_S@ EMACS = @EMACS@ ELISP = @ELISP@ From e5de6eca1d5d1ebd3738ea150058c36a50d6e3a9 Mon Sep 17 00:00:00 2001 From: posophe Date: Fri, 23 Jan 2015 11:47:14 +0100 Subject: [PATCH 3/4] Fix DESTDIR in Makefile.in Fix DESTDIR in Makefile.in and let system strip manpages itself --- doc/Makefile.in | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in index 709fa6d..159f815 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -111,29 +111,18 @@ gpmdoc.ps: gpm.ps # install & uninstall installdirs: - $(MKDIR) $(man1dir) $(man7dir) $(man8dir) $(infodir) + $(INSTALL_DIR) $(DESTDIR)$(man1dir) + $(INSTALL_DIR) $(DESTDIR)$(man7dir) + $(INSTALL_DIR) $(DESTDIR)$(man8dir) + $(INSTALL_DIR) $(DESTDIR)$(infodir) install: all installdirs - $(INSTALL_DATA) -m 644 mev.1 $(man1dir) - $(INSTALL_DATA) -m 644 mouse-test.1 $(man1dir) - $(INSTALL_DATA) -m 644 gpm-root.1 $(man1dir) - $(INSTALL_DATA) -m 644 gpm-types.7 $(man7dir) - $(INSTALL_DATA) -m 644 gpm.8 $(man8dir) - $(INSTALL_DATA) -m 644 $(srcdir)/gpm.info $(infodir) - # Use install-info if available - -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - if [ -f $(infodir)/dir ] ; then \ - install-info --dir-file=$(infodir)/dir $(infodir)/gpm.info; \ - fi; \ - fi - #itz Sat Dec 26 23:21:05 PST 1998 - #i keep all my infopages compressed and i'm tired to do it by - #hand, so check if there are any compressed pages and do this - #one too - -ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \ - && gzip -f $(infodir)/gpm.info - # Hmm.... shouldn't man pages be compressed too? - # maybe they should, but at least at my system they are not. +$(INSTALL_DATA) -m 644 mev.1 $(DESTDIR)$(man1dir) + $(INSTALL_DATA) -m 644 mouse-test.1 $(DESTDIR)$(man1dir) + $(INSTALL_DATA) -m 644 gpm-root.1 $(DESTDIR)$(man1dir) + $(INSTALL_DATA) -m 644 gpm-types.7 $(DESTDIR)$(man7dir) + $(INSTALL_DATA) -m 644 gpm.8 $(DESTDIR)$(man8dir) + $(INSTALL_DATA) -m 644 $(srcdir)/gpm.info $(DESTDIR)$(infodir) # This potentially leaves around cached manpages, # e.g. /var/cache/man/cat1/mev.1.gz. Deleting these is not our job, From 16628b44e999225c6bcf099bba004cb13be5324f Mon Sep 17 00:00:00 2001 From: posophe Date: Fri, 23 Jan 2015 11:50:27 +0100 Subject: [PATCH 4/4] Fix DESTDIR in Makefile.in --- src/Makefile.in | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 7e9e2ef..36638af 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -104,17 +104,17 @@ check: all installdirs: install: check - $(INSTALL_PROGRAM) gpm $(sbindir)/gpm + $(INSTALL_PROGRAM) gpm $(DESTDIR)$(sbindir)/gpm if [ -f lib/libgpm.a ] ; then \ - $(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a ; \ + $(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a ; \ fi - $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h + $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(DESTDIR)$(includedir)/gpm.h # POSIX requires the range of a for loop be nonempty and Bash # 2.x goes along; unfortunately that means an additional # headache in cases like this if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ - cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ; \ + cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ echo "WARNING: We installed a lib, you should now call ldconfig" ; \ echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ echo "Or to update everything just type ldconfig" ; \ @@ -124,7 +124,7 @@ install: check # prog/ for i in $(PROG); do \ - $(INSTALL_PROGRAM) $$i $(bindir)/`echo $$i | sed 's,prog/,,'` ;\ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/`echo $$i | sed 's,prog/,,'` ;\ done install-strip: @@ -133,10 +133,11 @@ install-strip: # Note: this leaves around /usr/lib/libgpm.so.1 and /usr/lib/libgpm.so.1.nn # This is probably the right thing, because programs may be linked to it uninstall: - rm -f $(bindir)/mev $(bindir)/gpm-root $(bindir)/disable-paste \ - $(sbindir)/gpm $(libdir)/libgpm.a $(libdir)/libgpm.so $(includedir)/gpm.h + rm -f $(DESTDIR)$(bindir)/mev $(DESTDIR)$(bindir)/gpm-root $(DESTDIR)$(bindir)/disable-paste \ + $(DESTDIR)$(sbindir)/gpm $(DESTDIR)$(libdir)/libgpm.a $(DESTDIR)$(libdir)/libgpm.so \ + $(DESTDIR) $(includedir)/gpm.h for i in $(PROG); do \ - rm -f $(bindir)/$$i ;\ + rm -f $(DESTDIR)$(bindir)/$$i ;\ done # Configure & unconfigure