aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2002-08-18 20:42:13 +0000
committerGerald Combs <gerald@wireshark.org>2002-08-18 20:42:13 +0000
commitc85e94578401c74b5986d902e373f83c699e2e04 (patch)
tree0ba857f33997bf922dbbae8d125be389fcc41ae4
parent868c88686f8bf4d1a0f9c42cef7b2cb712883101 (diff)
Tweak the Solaris/SVR4 packaging a bit. Change "make install-strip" to
"make install"; even though the resulting files are huge it's probably better to have the debugging symbols intact. Set file and directory permissions in /usr/local to match those in /usr. svn path=/trunk/; revision=6016
-rw-r--r--Makefile.am4
-rwxr-xr-xpackaging/svr4/mkpkg10
2 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 97ebbb78cd..dcd54cf70b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.451 2002/08/14 18:48:16 guy Exp $
+# $Id: Makefile.am,v 1.452 2002/08/18 20:42:09 gerald Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -1057,7 +1057,7 @@ host_os=@host_os@
svr4-package: $(bin_SCRIPTS) $(lib_LTLIBRARIES)
if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
rm -rf $(stagedir) ; \
- $(MAKE) DESTDIR=$(stagedir) install-strip; \
+ $(MAKE) DESTDIR=$(stagedir) install; \
$(srcdir)/packaging/svr4/mkpkg \
$(PACKAGE) \
$(PACKAGE)-$(VERSION)-$(host_os)-$(host_cpu)-local \
diff --git a/packaging/svr4/mkpkg b/packaging/svr4/mkpkg
index 40e20eb94a..27456964c7 100755
--- a/packaging/svr4/mkpkg
+++ b/packaging/svr4/mkpkg
@@ -47,7 +47,15 @@ if [ ! -d $stagedir ] ; then
fi
find $stagedir/$prefix/* -print | \
- pkgproto $stagedir/$prefix=$prefix >> $prototype
+ pkgproto $stagedir/$prefix=$prefix | \
+ # Mimic file permissions under /usr
+ awk ' \
+ /bin/ { print $1, $2, $3, $4, "root bin"; next }; \
+ /lib/ { print $1, $2, $3, $4, "root bin"; next }; \
+ /man/ { print $1, $2, $3, $4, "root bin"; next }; \
+ { print $1, $2, $3, $4, "root sys" } \
+ ' \
+ >> $prototype
# Make the package installation directory
pkgmk -o -r / -d /$srcdir -f $prototype