solaris distribution kit changes, reviewed by alex

builds/install/arch-specific/solaris/CS/prototype.icu.in

@@ -0,0 +1,13 @@
+# bundled ICU is used when user configures --with-system-icu=no
+
+f none @prefix@/lib/libicudata.so.30.0=$SRCDIR/lib/libicudata.so.30.0 0755 firebird firebird
+s none @prefix@/lib/libicudata.so.30=@prefix@/lib/libicudata.so.30.0
+s none @prefix@/lib/libicudata.so=@prefix@/lib/libicudata.so.30
+
+f none @prefix@/lib/libicui18n.so.30.0=$SRCDIR/lib/libicui18n.so.30.0 0755 firebird firebird
+s none @prefix@/lib/libicui18n.so.30=@prefix@/lib/libicui18n.so.30.0
+s none @prefix@/lib/libicui18n.so=@prefix@/lib/libicui18n.so.30
+
+f none @prefix@/lib/libicuuc.so.30.0=$SRCDIR/lib/libicuuc.so.30.0 0755 firebird firebird
+s none @prefix@/lib/libicuuc.so.30=@prefix@/lib/libicuuc.so.30.0
+s none @prefix@/lib/libicuuc.so=@prefix@/lib/libicuuc.so.30

builds/install/arch-specific/solaris/CS/prototype.in

@@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2
 d none @prefix@/include 0751 firebird firebird
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0444 firebird firebird
 f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0444 firebird firebird
-f none @prefix@/include/blr.h=$SRCDIR/include/blr.h 0444 firebird firebird
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0444 firebird firebird
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0444 firebird firebird
 
@@ -67,7 +66,6 @@ f none @prefix@/bin/gsplit=$SRCDIR/bin/gsplit 0451 firebird firebird
 f none @prefix@/bin/gsec=$SRCDIR/bin/gsec 0451 firebird firebird
 f none @prefix@/bin/isql=$SRCDIR/bin/isql 0555 firebird firebird
 f none @prefix@/bin/gpre=$SRCDIR/bin/gpre 0451 firebird firebird
-f none @prefix@/bin/gds_drop=$SRCDIR/bin/gds_drop 0451 firebird firebird
 f none @prefix@/bin/gstat=$SRCDIR/bin/gstat 0451 firebird firebird
 #f none @prefix@/bin/fbguard=$SRCDIR/bin/fbguard 0451 firebird firebird
 #f none @prefix@/bin/fbmgr.bin=$SRCDIR/bin/fbmgr.bin 0451 firebird firebird
@@ -170,20 +168,6 @@ s none @prefix@/lib/libfbembed.so=@prefix@/lib/libfbembed.so.2
 
 f none @prefix@/lib/libib_util.so=$SRCDIR/lib/libib_util.so 0555 firebird firebird
 
-# ICU
-
-f none @prefix@/lib/libicudata.so.30.0=$SRCDIR/lib/libicudata.so.30.0 0755 firebird firebird
-s none @prefix@/lib/libicudata.so.30=@prefix@/lib/libicudata.so.30.0
-s none @prefix@/lib/libicudata.so=@prefix@/lib/libicudata.so.30
-
-f none @prefix@/lib/libicui18n.so.30.0=$SRCDIR/lib/libicui18n.so.30.0 0755 firebird firebird
-s none @prefix@/lib/libicui18n.so.30=@prefix@/lib/libicui18n.so.30.0
-s none @prefix@/lib/libicui18n.so=@prefix@/lib/libicui18n.so.30
-
-f none @prefix@/lib/libicuuc.so.30.0=$SRCDIR/lib/libicuuc.so.30.0 0755 firebird firebird
-s none @prefix@/lib/libicuuc.so.30=@prefix@/lib/libicuuc.so.30.0
-s none @prefix@/lib/libicuuc.so=@prefix@/lib/libicuuc.so.30
-
 # help 
 
 d none @prefix@/help 0751 firebird firebird
@@ -245,10 +229,7 @@ f none @prefix@/doc/sql.extensions/README.trim=$SRCDIR/../../doc/sql.extensions/
 f none @prefix@/doc/sql.extensions/README.universal_triggers=$SRCDIR/../../doc/sql.extensions/README.universal_triggers 0644 firebird firebird
 f none @prefix@/doc/sql.extensions/README.update_or_insert=$SRCDIR/../../doc/sql.extensions/README.update_or_insert 0644 firebird firebird
 f none @prefix@/doc/sql.extensions/README.view_updates=$SRCDIR/../../doc/sql.extensions/README.view_updates 0644 firebird firebird
-f none @prefix@/doc/Firebird-2-QuickStart.pdf=$SRCDIR/../../doc/Firebird-2-QuickStart.pdf 0644 firebird firebird
+f none @prefix@/doc/ReleaseNotes.pdf=$SRCDIR/../../doc/ReleaseNotes.pdf 0644 firebird firebird
-f none @prefix@/doc/Firebird-2.1-ReleaseNotes.pdf=$SRCDIR/../../doc/Firebird-2.1-ReleaseNotes.pdf 0644 firebird firebird
-f none @prefix@/doc/Firebird-2.1-Installation.pdf=$SRCDIR/../../doc/Firebird-2.1-Installation.pdf 0644 firebird firebird
-f none @prefix@/doc/Firebird-2.1-BugFixes.pdf=$SRCDIR/../../doc/Firebird-2.1-BugFixes.pdf 0644 firebird firebird
 f none @prefix@/doc/ods11-index-structure.html=$SRCDIR/../../doc/ods11-index-structure.html 0644 firebird firebird
 f none @prefix@/doc/README.build.mingw.html=$SRCDIR/../../doc/README.build.mingw.html 0644 firebird firebird
 f none @prefix@/doc/README.build.msvc.html=$SRCDIR/../../doc/README.build.msvc.html 0644 firebird firebird

builds/install/arch-specific/solaris/Makefile.in

@@ -39,7 +39,7 @@ include     $(ROOT)/gen/make.shared.variables
 
 
 PGK_FILES=pkginfo prototype preinstall postinstall postremove
-PKG_DIR=$(RealFirebirdPath)/install
+PKG_DIR=$(GEN_ROOT)/install
 PKG_NAME=Firebird@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-Solaris10-@CPU_TYPE@.pkg
 GCC_PKG_NAME=Firebird-libgcc-Solaris10-@CPU_TYPE@.pkg
 
@@ -47,14 +47,20 @@ install package packages dist:
 	@echo Making Solaris @CPU_TYPE@ package...
 	rm -rf $(PKG_DIR)/Firebird2
 	-mkdir -p $(PKG_DIR)
-	(cd $(PKG_DIR); pkgmk -o  -d $(PKG_DIR))
+	(cd $(PKG_DIR); rm -f Prototype)
-	pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(PKG_NAME) Firebird2
+	(cd $(PKG_DIR); cat prototype.main >> Prototype)
+ifeq ($(STD_ICU),false)
+	(cd $(PKG_DIR); cat prototype.icu >> Prototype)
+endif
+	(cd $(PKG_DIR); pkgmk -o -d .)
+	(cd $(PKG_DIR); pkgtrans -s . ./$(PKG_NAME) Firebird2)
+
 libs:
 	@echo Making Solaris @CPU_TYPE@ libgcc package...
 	rm -rf $(PKG_DIR)/libgcc
 	-mkdir -p $(PKG_DIR)
-	(cd $(PKG_DIR); pkgmk -o -f prototypelg -d $(PKG_DIR))
+	(cd $(PKG_DIR); pkgmk -o -f prototypelg -d .)
-	pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(GCC_PKG_NAME) Firebird-libgcc 
+	(cd $(PKG_DIR); pkgtrans -s . ./$(GCC_PKG_NAME) Firebird-libgcc)
 	
 clean clobber:
 	rm -rf $(PKG_DIR)/Firebird2

builds/install/arch-specific/solaris/SS/prototype.icu.in

@@ -0,0 +1,13 @@
+# bundled ICU is used when user configures --with-system-icu=no
+
+f none @prefix@/lib/libicudata.so.30.0=$SRCDIR/lib/libicudata.so.30.0 0755 firebird firebird
+s none @prefix@/lib/libicudata.so.30=@prefix@/lib/libicudata.so.30.0
+s none @prefix@/lib/libicudata.so=@prefix@/lib/libicudata.so.30
+
+f none @prefix@/lib/libicui18n.so.30.0=$SRCDIR/lib/libicui18n.so.30.0 0755 firebird firebird
+s none @prefix@/lib/libicui18n.so.30=@prefix@/lib/libicui18n.so.30.0
+s none @prefix@/lib/libicui18n.so=@prefix@/lib/libicui18n.so.30
+
+f none @prefix@/lib/libicuuc.so.30.0=$SRCDIR/lib/libicuuc.so.30.0 0755 firebird firebird
+s none @prefix@/lib/libicuuc.so.30=@prefix@/lib/libicuuc.so.30.0
+s none @prefix@/lib/libicuuc.so=@prefix@/lib/libicuuc.so.30

builds/install/arch-specific/solaris/SS/prototype.in

@@ -66,7 +66,6 @@ f none @prefix@/bin/gsplit=$SRCDIR/bin/gsplit 0755 firebird firebird
 f none @prefix@/bin/gsec=$SRCDIR/bin/gsec 0755 firebird firebird
 f none @prefix@/bin/isql=$SRCDIR/bin/isql 0755 firebird firebird
 f none @prefix@/bin/gpre=$SRCDIR/bin/gpre 0755 firebird firebird
-#f none @prefix@/bin/gds_drop=$SRCDIR/bin/gds_drop 0451 firebird firebird
 f none @prefix@/bin/gstat=$SRCDIR/bin/gstat 0451 firebird firebird
 f none @prefix@/bin/fbguard=$SRCDIR/bin/fbguard 0755 firebird firebird
 f none @prefix@/bin/fbserver=$SRCDIR/bin/fbserver 0755 firebird firebird
@@ -178,20 +177,6 @@ s none @prefix@/lib/libfbclient.so=@prefix@/lib/libfbclient.so.2
 
 f none @prefix@/lib/libib_util.so=$SRCDIR/lib/libib_util.so 0755 firebird firebird
 
-# ICU
-
-f none @prefix@/lib/libicudata.so.30.0=$SRCDIR/lib/libicudata.so.30.0 0755 firebird firebird
-s none @prefix@/lib/libicudata.so.30=@prefix@/lib/libicudata.so.30.0
-s none @prefix@/lib/libicudata.so=@prefix@/lib/libicudata.so.30
-
-f none @prefix@/lib/libicui18n.so.30.0=$SRCDIR/lib/libicui18n.so.30.0 0755 firebird firebird
-s none @prefix@/lib/libicui18n.so.30=@prefix@/lib/libicui18n.so.30.0
-s none @prefix@/lib/libicui18n.so=@prefix@/lib/libicui18n.so.30
-
-f none @prefix@/lib/libicuuc.so.30.0=$SRCDIR/lib/libicuuc.so.30.0 0755 firebird firebird
-s none @prefix@/lib/libicuuc.so.30=@prefix@/lib/libicuuc.so.30.0
-s none @prefix@/lib/libicuuc.so=@prefix@/lib/libicuuc.so.30
-
 # help 
 
 d none @prefix@/help 0755 firebird firebird
@@ -253,10 +238,7 @@ f none @prefix@/doc/sql.extensions/README.trim=$SRCDIR/../../doc/sql.extensions/
 f none @prefix@/doc/sql.extensions/README.universal_triggers=$SRCDIR/../../doc/sql.extensions/README.universal_triggers 0644 firebird firebird
 f none @prefix@/doc/sql.extensions/README.update_or_insert=$SRCDIR/../../doc/sql.extensions/README.update_or_insert 0644 firebird firebird
 f none @prefix@/doc/sql.extensions/README.view_updates=$SRCDIR/../../doc/sql.extensions/README.view_updates 0644 firebird firebird
-f none @prefix@/doc/Firebird-2-QuickStart.pdf=$SRCDIR/../../doc/Firebird-2-QuickStart.pdf 0644 firebird firebird
+f none @prefix@/doc/ReleaseNotes.pdf=$SRCDIR/../../doc/ReleaseNotes.pdf 0644 firebird firebird
-f none @prefix@/doc/Firebird-2.1-ReleaseNotes.pdf=$SRCDIR/../../doc/Firebird-2.1-ReleaseNotes.pdf 0644 firebird firebird
-f none @prefix@/doc/Firebird-2.1-Installation.pdf=$SRCDIR/../../doc/Firebird-2.1-Installation.pdf 0644 firebird firebird
-f none @prefix@/doc/Firebird-2.1-BugFixes.pdf=$SRCDIR/../../doc/Firebird-2.1-BugFixes.pdf 0644 firebird firebird
 f none @prefix@/doc/ods11-index-structure.html=$SRCDIR/../../doc/ods11-index-structure.html 0644 firebird firebird
 f none @prefix@/doc/README.build.mingw.html=$SRCDIR/../../doc/README.build.mingw.html 0644 firebird firebird
 f none @prefix@/doc/README.build.msvc.html=$SRCDIR/../../doc/README.build.msvc.html 0644 firebird firebird

builds/posix/Makefile.in.firebird

@@ -590,14 +590,14 @@ clean_dependancies:
 # MOD 11-July-2002
 
 clean_build:
-	$(RM) `find $(GEN_ROOT)/firebird -type f -print`
+	$(RM) `find $(GEN_ROOT)/firebird \( -type f -o -type l \) -print`
-	$(RM) `find $(GEN_ROOT)/firebird -type l -print`
 #	$(RM) $(GDSLIB_OBJECTS) $(GDSLIB_PHASE3_OBJECTS)
 
 # 
 clean_makefiles:
 	$(RM) $(GEN_ROOT)/Make*
 	$(RM) $(GEN_ROOT)/make*
+	$(RM) `find $(GEN_ROOT)/install \( -type f -o -type l \) -print`
 	-$(RM) $(GEN_ROOT)/examples/Make*
 	$(RM) $(ROOT)/Makefile
 	$(RM) $(SRC_ROOT)/include/gen/autoconfig.h

configure.in

@@ -1232,14 +1232,15 @@ case "$PLATFORM" in
 
 
   solx86|SOLARIS)
-    AC_CONFIG_FILES([gen/firebird/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
+    AC_CONFIG_FILES([gen/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
-                     gen/firebird/install/Prototype:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in
+                     gen/install/prototype.main:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in
-                     gen/firebird/install/Preinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/preinstall.in
+                     gen/install/prototype.icu:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.icu.in
-                     gen/firebird/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
+                     gen/install/Preinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/preinstall.in
-                     gen/firebird/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
+                     gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
-		     gen/firebird/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
+                     gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
-		     gen/firebird/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in
+                     gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
-      ],[chmod a+x gen/firebird/install/Pre* gen/install/Post* 2>/dev/null])
+                     gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in
+      ],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
     ;;
 
   DARWIN)