Changeset 23096 for gs2-extensions

Timestamp:

2010-10-12T10:16:04+13:00 (14 years ago)

Author:

sjm84

Message:

Upgraded this extension to use the exthome variable correctly and a few other minor fixes

Location:

gs2-extensions/gnome-lib/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• devel.bash (modified) (2 diffs)
• packages/CASCADE-MAKE.sh (modified) (2 diffs)
• packages/CASCADE-MAKE/GETTEXT.sh (modified) (1 diff)
• packages/CASCADE-MAKE/GLIB.sh (modified) (1 diff)
• packages/CASCADE-MAKE/INTLTOOL.sh (modified) (1 diff)
• packages/CASCADE-MAKE/LIBGSF.sh (modified) (1 diff)
• packages/CASCADE-MAKE/LIBXML.sh (modified) (1 diff)
• packages/CASCADE-MAKE/PKG-CONFIG.sh (modified) (1 diff)

gs2-extensions/gnome-lib/trunk/src/CASCADE-MAKE.sh

@@ -13 +13 @@
     fi
 done
+
+if [ $makedist = "1"  ] ; then
+  toplevel_make_dist
+fi

gs2-extensions/gnome-lib/trunk/src/devel.bash

@@ -2 +2 @@
 
 if [ -d cascade-make ] ; then
-  source cascade-make/lib/cascade-lib.bash
+  source cascade-make/lib/cascade-lib.bash GEXTGNOME . $*
 fi
 
@@ -27 +27 @@
         pushd $GEXTGNOME_INSTALLED/lib/pkgconfig
 
-#   pcfilelist=`ls *.pc`
-#   firstfile=`$pcfilelist | head -1`
-#   pkgconfigprefix=`awk '/^prefix=/{ sub(/^prefix=/, "") ; print }' $firstfile`
-
-#   if [ "$pkgconfigprefix" = "$GEXTGNOME_INSTALLED" ] ; then
-#       echo "OK"
-#   else
-#       echo "NO - Correcting configuration..."
-
-#       for file in $pcfilelist ; do
-#           awk '{ sub(/^prefix=\/.*$/, "prefix=$GEXTGNOME_INSTALLED") ; print }' $file > $file
-#       done 
-#       
-#       echo "COMPLETE"
-#   fi
-
-
         if [ ! -e .fixed-prefix.awk ] ; then
 

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

@@ -1 +1 @@
 #!/bin/bash
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME .. $*
 
 for d in INTLTOOL GETTEXT PKG-CONFIG LIBXML GLIB LIBGSF; do
@@ -14 +14 @@
 done
 
-
 if [ $install = "1" ] ; then
   touch "$GEXTGNOME_INSTALLED/lib/pkgconfig/.fixed-prefix.awk"
 fi
 
+if [ $makedist = "1" ] ; then
+  rm -f "$GEXTGNOME_INSTALLED/lib/pkgconfig/.fixed-prefix.awk"
+fi

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/GETTEXT.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME ../.. $*
 
 prefix=$GEXTGNOME_INSTALLED

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/GLIB.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME ../.. $*
 
 prefix=$GEXTGNOME_INSTALLED

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/INTLTOOL.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME ../.. $*
 
 prefix=$GEXTGNOME_INSTALLED

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/LIBGSF.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME ../.. $*
 
 prefix=$GEXTGNOME_INSTALLED

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/LIBXML.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME ../.. $*
 
 prefix=$GEXTGNOME_INSTALLED

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/PKG-CONFIG.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTGNOME ../.. $*
 
 prefix=$GEXTGNOME_INSTALLED