Merge pull request #35 from aleibl/develop

Some cleanup plus packaging enhancements.
certnanny · Apr 30, 2014 · 16c99f9 · 16c99f9
2 parents 1995e38 + 04ab0ac
commit 16c99f9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/AIX/Makefile b/AIX/Makefile
@@ -10,7 +10,7 @@ WITH_DEBUG   = -g
 OPENSSL = ../openssl
 CFLAGS	= -O $(WITH_DEBUG) -I $(OPENSSL)/include 
 
-LDFLAGS = -L$(OPENSSL)/lib
+LDFLAGS = -L$(OPENSSL)
 LDLIBS = -lcrypto
 
 MAN	= sscep.8

diff --git a/AIX/lpp_template.in b/AIX/lpp_template.in
@@ -10,8 +10,8 @@ Fileset
   Include license files in this package: N
   Requisites:
   USRLIBLPPFiles
-    Pre-installation Script: __PACKAGINGDIR__/AIX/sscep.pre-install.sh
-    Pre-deinstall Script: __PACKAGINGDIR__/AIX/sscep.pre-deinstall.sh
+    Post-installation Script: __PACKAGINGDIR__/AIX/sscep.post-install.sh
+    Unconfiguration Script: __PACKAGINGDIR__/AIX/sscep.unconfiguration.sh
   EOUSRLIBLPPFiles
   USRFiles
     /opt/CertNanny

diff --git a/AIX/sscep.pre-install.sh → AIX/sscep.post-install.sh b/AIX/sscep.pre-install.sh → AIX/sscep.post-install.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/ksh
 
 /usr/bin/ln -fs /opt/CertNanny/bin/sscep_static /usr/bin/sscep
+/usr/bin/ln -fs /opt/CertNanny/bin/sscep_static /opt/CertNanny/bin/sscep
 
diff --git a/AIX/sscep.pre-deinstall.sh b/AIX/sscep.pre-deinstall.sh
diff --git a/AIX/sscep.unconfiguration.sh b/AIX/sscep.unconfiguration.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/ksh
+
+/usr/bin/rm -f /usr/bin/sscep
+/usr/bin/rm -f /opt/CertNanny/bin/sscep
+
diff --git a/tmp/README.install → README.install b/tmp/README.install → README.install
diff --git a/Solaris/Prototype b/Solaris/Prototype
@@ -8,5 +8,5 @@ s none /opt/CertNanny/bin/sscep=/opt/CertNanny/bin/sscep_static
 f none /opt/CertNanny/COPYRIGHT.sscep 0644 root root
 d none /usr ? ? ?
 d none /usr/bin ? ? ?
-s none /usr/bin/sscep=/opt/CertNanny/bin/sscep_static
+#s none /usr/bin/sscep=/opt/CertNanny/bin/sscep_static