Skip to content

Fix DESTDIR #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
posophe wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix DESTDIR #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1852c57
Fix DESTDIR in Makefile.in
posophe Jan 23, 2015
25e9dee
Fix DESTDIR in Makefile.include.in
posophe Jan 23, 2015
e5de6ec
Fix DESTDIR in Makefile.in
posophe Jan 23, 2015
16628b4
Fix DESTDIR in Makefile.in
posophe Jan 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Makefile.include.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down
31 changes: 10 additions & 21 deletions doc/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
19 changes: 10 additions & 9 deletions src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ; \
Expand All @@ -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:
Expand All @@ -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
Expand Down