[Bug 269] Solaris package build warnings with HTML=no

Applied Tim's patch to make stripping of binaries in html/ conditional
on HTML=yes

diff --git a/pkg/Makefile.in b/pkg/Makefile.in
index f6bc9d31f65dc72e61c65b6753c5cbef0ca7aa05..471d78dac4b8e6f04c5028abf86e7ae9d7c7f05b 100644 (file)
--- a/pkg/Makefile.in
+++ b/pkg/Makefile.in
@@ -61,8 +61,6 @@ BINARIES=\
        ../util/textfmt                 \
        ../util/tiffcheck               \
        ../util/typetest                \
-       ../html/tools/man2html          \
-       ../html/tools/unquote           \
        ${NULL}
 
 package: cproto sproto all
@@ -71,19 +69,23 @@ package: cproto sproto all
        for i in ${BINARIES} ; do                       \
                strip ${SRCDIR}/$$i ;                   \
        done ;                                          \
+       if [ "@HTML@" = yes ]; then                     \
+               strip ${SRCDIR}/../html/tools/man2html; \
+               strip ${SRCDIR}/../html/tools/unquote;  \
+       fi;                                             \
        @RM@ -f pkginfo 2>/dev/null;                    \
        @RM@ -f request 2>/dev/null;                    \
        cp cpkginfo pkginfo ;                           \
        cp crequest request ;                           \
        pkgmk -d `pwd` -f cproto ;                      \
-       pkgtrans -s `pwd` `pwd`/HylaFAX-client-@VERSION@.pkg HylaFAX ; \
+       pkgtrans -s `pwd` `pwd`/HylaFAX-client-@VERSION@-@PKG_ARCH@.pkg HylaFAX ; \
        @RM@ -fr HylaFAX ;                              \
        @RM@ -f pkginfo 2>/dev/null;                    \
        @RM@ -f request 2>/dev/null;                    \
        cp spkginfo pkginfo ;                           \
        cp srequest request ;                           \
        pkgmk -d `pwd` -f sproto ;                      \
-       pkgtrans -s `pwd` `pwd`/HylaFAX-@VERSION@.pkg HylaFAX
+       pkgtrans -s `pwd` `pwd`/HylaFAX-@VERSION@-@PKG_ARCH@.pkg HylaFAX
 
 cproto: cproto.stub
        ${SHELL} ./make_proto.sh client
@@ -94,8 +96,8 @@ sproto: sproto.stub
 clean:
        @RM@ -f cproto sproto
        @RM@ -fr HylaFAX
-       @RM@ -f HylaFAX-client-@VERSION@.pkg
-       @RM@ -f HylaFAX-@VERSION@.pkg
+       @RM@ -f HylaFAX-client-@VERSION@-@PKG_ARCH@.pkg
+       @RM@ -f HylaFAX-@VERSION@-@PKG_ARCH@.pkg
        @RM@ -f pkginfo
        @RM@ -f request
        @RM@ -f core*

diff --git a/pkg/sproto.stub.in b/pkg/sproto.stub.in
index aec435a2869f04067e831b53293dbfeb23d77f4c..a6b7897b6aba03facee2756f862061533e673b62 100644 (file)
--- a/pkg/sproto.stub.in
+++ b/pkg/sproto.stub.in
@@ -118,7 +118,7 @@ f none @SBIN@/faxsetup.linux=../@SRCDIR@/etc/faxsetup.linux 0755 @SYSUID@ @SYSGI
 f none @SBIN@/probemodem=../etc/probemodem.sh 0755 @SYSUID@ @SYSGID@
 d none @SPOOL@ 0755 @FAXUID@ @FAXGID@
 d none @SPOOL@/bin 0755 @FAXUID@ @FAXGID@
-f none @SPOOL@/bin/pdf2fax.gs=../@SRCDIR@/util/pdf2fax.gs.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/pdf2fax.gs=../util/pdf2fax.gs.sh 0755 @SYSUID@ @SYSGID@
 f none @SPOOL@/bin/ps2fax.gs=../util/ps2fax.gs.sh 0755 @SYSUID@ @SYSGID@
 f none @SPOOL@/bin/ps2fax.dps=../util/ps2fax.dps.sh 0755 @SYSUID@ @SYSGID@
 f none @SPOOL@/bin/ps2fax.imp=../util/ps2fax.imp.sh 0755 @SYSUID@ @SYSGID@