fixing some packaging stuff for Solaris

diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh.tmpl
similarity index 98%
rename from packaging/Solaris/makepkg.sh
rename to packaging/Solaris/makepkg.sh.tmpl
index 8423a1a9b49bb0a5e1aca4a587ff5643ed3db54a..55a2da2c6a093f88143a2badebcf08b2d6397513 100755 (executable)
--- a/packaging/Solaris/makepkg.sh
+++ b/packaging/Solaris/makepkg.sh.tmpl
@@ -144,7 +144,7 @@ if [ -f prototype ]; then
 fi
 
 # Setup version from version.h
-VERSION=`sed 's/#define VERSION \"\(.*\)\"$/\1/' ../../source/include/version.h`
+VERSION=PVERSION
 sed -e "s|__VERSION__|$VERSION|" -e "s|__ARCH__|`uname -p`|" -e "s|__BASEDIR__|$INSTALL_BASE|g" pkginfo.master >pkginfo
 
 sed -e "s|__BASEDIR__|$INSTALL_BASE|g" inetd.conf.master >inetd.conf

diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index 8432173cc8826bdbf0fd3a49323d7064ebf9aa1e..47f3c3c306b187923e20af80af664f8a97251c17 100755 (executable)
--- a/packaging/bin/update-pkginfo
+++ b/packaging/bin/update-pkginfo
@@ -8,13 +8,9 @@ if [ $# -ne 2 ]; then
     exit 1
 fi
 
-for f in */*/*.tmpl; do
-       f2=`echo $f | sed s/.tmpl//g`
-       echo $f2
-       sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
-done
-for f in */*.tmpl; do
-       f2=`echo $f | sed s/.tmpl//g`
-       echo $f2
-       sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
+for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
+        f2=`echo $f | sed s/.tmpl//g`
+        echo $f2
+        sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
 done
+