Changeset 44 for trunk/Makefile.in

Timestamp:

Jun 5, 2006, 10:53:07 PM (18 years ago)

Author:

rainer

Message:

Improved fix for solaris package creation.

File:

• trunk/Makefile.in (modified) (2 diffs)

trunk/Makefile.in

@@ -948 +948 @@
         group=`id | sed s,.*gid=[0123456789]*\(,, | sed s,\).*,,`; \
         cat prototype | grep -v 'none / ' | \
-        sed 's,none /etc .*,none /etc ? ? ?,' | \
-        sed 's,none /etc/init.d .*,none /etc/init.d ? ? ?,' | \
-        sed 's,none /usr .*,none /usr ? ? ?,' | \
-        sed 's,none /usr/bin .*,none /usr/bin ? ? ?,' | \
-        sed 's,none /var .*,none /var ? ? ?,' | \
-        sed 's,none /var/lib .*,none /var/lib ? ? ?,' | \
-        sed 's,none /var/log .*,none /var/log ? ? ?,' | \
-        sed 's,none /var/run .*,none /var/run ? ? ?,' | \
-        sed 's,none /usr/sbin .*,none /usr/sbin ? ? ?,' | \
         sed s,$$user\ $$group,root\ sys,g > prototype.1; \
-        rm -f prototype && mv prototype.1 prototype; \
-        if test -d /usr/local; then \
-                cat prototype | \
-                sed 's,none /usr/local .*,none /usr/local ? ? ?,' >prototype.1;\
-                rm -f prototype && mv prototype.1 prototype; \
-        fi; \
-        if test -d /usr/local/bin; then \
-                cat prototype | \
-                sed 's,none /usr/local/bin .*,none /usr/local/bin ? ? ?,' >prototype.1;\
-                rm -f prototype && mv prototype.1 prototype; \
-        fi; \
-        if test -d /usr/local/sbin; then \
-                cat prototype | \
-                sed 's,none /usr/local/sbin .*,none /usr/local/sbin ? ? ?,' >prototype.1;\
-                rm -f prototype && mv prototype.1 prototype; \
-        fi; \
-        if test -d /usr/local/man; then \
-                cat prototype | \
-                sed 's,none /usr/local/man .*,none /usr/local/man ? ? ?,' >prototype.1;\
-                rm -f prototype && mv prototype.1 prototype; \
-        fi; \
-        if test -d /usr/local/man/man5; then \
-                cat prototype | \
-                sed 's,none /usr/local/man/man5 .*,none /usr/local/man/man5 ? ? ?,' >prototype.1;\
-                rm -f prototype && mv prototype.1 prototype; \
-        fi; \
-        if test -d /usr/local/man/man8; then \
-                cat prototype | \
-                sed 's,none /usr/local/man/man8 .*,none /usr/local/man/man8 ? ? ?,' >prototype.1;\
-                rm -f prototype && mv prototype.1 prototype; \
-        fi; \
+        rm -f prototype.2; \
+        while read line; do \
+                echo "$${line}" | egrep '^d none' >/dev/null 2>&1;  \
+                if [ $$? = 0 ]; then \
+                        dir=`echo "$${line}" | awk '{ print $$3 }'`; \
+                        if [ -d "$$dir" ]; then \
+                                echo "d none $${dir} ? ? ?" >> prototype.2; \
+                        else \
+                                echo "$${line}" >> prototype.2; \
+                        fi; \
+                else \
+                        echo "$${line}" >> prototype.2; \
+                fi; \
+        done < prototype.1; \
+        rm -f prototype && rm prototype.1 && mv prototype.2 prototype; \
         echo "d none /etc/rc0.d ? ? ?" >> prototype; \
         echo "d none /etc/rc1.d ? ? ?" >> prototype; \
@@ -1012 +987 @@
           cp /tmp/samhain-pkg-staging/@install_name@.pkg $(PACKAGE)-$(VERSION).pkg; \
           echo "Package $(PACKAGE)-$(VERSION).pkg is ready for installation"; \
+          echo "to install, use: pkgadd -n -d $(PACKAGE)-$(VERSION).pkg all"; \
           echo; \
           rm -rf /var/spool/pkg/@install_name@ /tmp/samhain-pkg-staging; \