|
Check-in Number:
|
169 | |
| Date: |
2000-Oct-04 14:15:29 (local)
2000-Oct-04 12:15:29 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
*** empty log message *** |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/shtool/ChangeLog 1.134 -> 1.135
--- ChangeLog 2000/10/05 12:02:06 1.134
+++ ChangeLog 2000/10/05 12:15:29 1.135
@@ -11,6 +11,11 @@
Changes between 1.5.1 and 1.5.2 (06-Jul-2000 to xx-Sep-2000):
+ *) Added support to Makefile.in for DESTDIR variable. This allows
+ easier rolling of installation tarballs (for instance from within
+ RPM or similar facilities) by using "make install DESTDIR=/tmp/shtool".
+ [Brad Smith <brad@comstyle.com>]
+
*) Actually use the determined `find' command instead of the
hard-coded one in `shtool tarball'.
[Denis Barbier <barbier@imacs.polytechnique.fr>]
|
|
ossp-pkg/shtool/Makefile.in 1.39 -> 1.40
--- Makefile.in 2000/06/30 16:27:41 1.39
+++ Makefile.in 2000/10/05 12:15:29 1.40
@@ -29,6 +29,8 @@
aclocaldir = $(datadir)/aclocal
pkgdatadir = $(datadir)/shtool
+DESTDIR =
+
SHELL = /bin/sh
PERL = @PERL@
POD2MAN = @POD2MAN@
@@ -90,38 +92,38 @@
@$(SHELL) test.sh
install: all
- ./shtool mkdir -f -p -m 755 $(prefix)
- ./shtool mkdir -f -p -m 755 $(bindir)
- ./shtool mkdir -f -p -m 755 $(mandir)/man1
- ./shtool mkdir -f -p -m 755 $(aclocaldir)
- ./shtool mkdir -f -p -m 755 $(pkgdatadir)
- ./shtool install -c -m 755 shtool $(bindir)/shtool
- ./shtool install -c -m 755 shtoolize $(bindir)/shtoolize
- ./shtool install -c -m 644 shtool.1 $(mandir)/man1/shtool.1
- ./shtool install -c -m 644 shtoolize.1 $(mandir)/man1/shtoolize.1
- ./shtool install -c -m 644 shtool.m4 $(aclocaldir)/shtool.m4
+ ./shtool mkdir -f -p -m 755 $(DESTDIR)$(prefix)
+ ./shtool mkdir -f -p -m 755 $(DESTDIR)$(bindir)
+ ./shtool mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+ ./shtool mkdir -f -p -m 755 $(DESTDIR)$(aclocaldir)
+ ./shtool mkdir -f -p -m 755 $(DESTDIR)$(pkgdatadir)
+ ./shtool install -c -m 755 shtool $(DESTDIR)$(bindir)/shtool
+ ./shtool install -c -m 755 shtoolize $(DESTDIR)$(bindir)/shtoolize
+ ./shtool install -c -m 644 shtool.1 $(DESTDIR)$(mandir)/man1/shtool.1
+ ./shtool install -c -m 644 shtoolize.1 $(DESTDIR)$(mandir)/man1/shtoolize.1
+ ./shtool install -c -m 644 shtool.m4 $(DESTDIR)$(aclocaldir)/shtool.m4
@for script in sh.common $(SCRIPTS); do \
- echo "./shtool install -c -m 644 $$script $(pkgdatadir)/$$script"; \
- ./shtool install -c -m 644 $$script $(pkgdatadir)/$$script; \
+ echo "./shtool install -c -m 644 $$script $(DESTDIR)$(pkgdatadir)/$$script"; \
+ ./shtool install -c -m 644 $$script $(DESTDIR)$(pkgdatadir)/$$script; \
done
uninstall:
@for script in sh.common $(SCRIPTS); do \
- echo "$(RM) $(pkgdatadir)/$$script"; \
- $(RM) $(pkgdatadir)/$$script; \
+ echo "$(RM) $(DESTDIR)$(pkgdatadir)/$$script"; \
+ $(RM) $(DESTDIR)$(pkgdatadir)/$$script; \
done
- $(RM) $(aclocaldir)/shtool.m4
- $(RM) $(mandir)/man1/shtoolize.1
- $(RM) $(mandir)/man1/shtool.1
- $(RM) $(bindir)/shtoolize
- $(RM) $(bindir)/shtool
- $(RMDIR) $(aclocaldir) >/dev/null 2>&1 || $(TRUE)
- $(RMDIR) $(pkgdatadir) >/dev/null 2>&1 || $(TRUE)
- $(RMDIR) $(datadir) >/dev/null 2>&1 || $(TRUE)
- $(RMDIR) $(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
- $(RMDIR) $(mandir) >/dev/null 2>&1 || $(TRUE)
- $(RMDIR) $(bindir) >/dev/null 2>&1 || $(TRUE)
- $(RMDIR) $(prefix) >/dev/null 2>&1 || $(TRUE)
+ $(RM) $(DESTDIR)$(aclocaldir)/shtool.m4
+ $(RM) $(DESTDIR)$(mandir)/man1/shtoolize.1
+ $(RM) $(DESTDIR)$(mandir)/man1/shtool.1
+ $(RM) $(DESTDIR)$(bindir)/shtoolize
+ $(RM) $(DESTDIR)$(bindir)/shtool
+ $(RMDIR) $(DESTDIR)$(aclocaldir) >/dev/null 2>&1 || $(TRUE)
+ $(RMDIR) $(DESTDIR)$(pkgdatadir) >/dev/null 2>&1 || $(TRUE)
+ $(RMDIR) $(DESTDIR)$(datadir) >/dev/null 2>&1 || $(TRUE)
+ $(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
+ $(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
+ $(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
+ $(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
clean:
$(RM) shtool shtool.1 shtoolize.1
|
|
