[Gnash-commit] gnash/packaging install-gnash.sh snapshot.am

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/10 06:49:51

Modified files:
        packaging      : install-gnash.sh snapshot.am 

Log message:
                * packaging/install-gnash.sh: Install everything correctly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/install-gnash.sh?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/snapshot.am?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: install-gnash.sh
===================================================================
RCS file: /sources/gnash/gnash/packaging/install-gnash.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- install-gnash.sh    7 Feb 2008 21:55:24 -0000       1.3
+++ install-gnash.sh    10 Feb 2008 06:49:50 -0000      1.4
@@ -44,7 +44,7 @@
 # set to any command to execute to make the shell commands not
 # make any actual changes on disk. 'echo' is the usual value here
 # for this, as it just displays the commands to the screen.
-debug=echo
+debug=
 
 # set 'yes' to 'yes', and you don't get asked for prompts.
 # Use with care!!! Note that setting this to yes obligates the user
@@ -128,7 +128,7 @@
   if [ x"${nsapidir}" = x"@FIREFOX_PLUGINS@" ]; then
     # OpenBSD 4.2, at the least. uses this path for the plugin
     if [ -d /usr/local/mozilla-firefox/plugins ]; then
-      nsapidir="/usr/local/mozilla-firefox/plugins"
+      nsapidir="/usr/local/mozilla-firefox/plugin"s
       field=4
     fi
     # this is the standard defalt path, common on most GNU/Linux distros
@@ -205,7 +205,17 @@
     fi
   fi
 
-  # dopcumentation gets installed here
+#   sodir=/etc/ld.so.conf.d
+#   if [ ! -w ${sodir} ]; then
+#     needstobe="`ls -ld ${sodir} | cut -f ${field} -d ' ' 2>&1`"
+#     if [ x`whoami` != xroot ]; then
+#       echo "Sorry dude, you need to be have write permissions to 
\"${sodir}\" to install Gnash"
+#       echo "Or be the user \"${needstobe}\""
+#       $debug exit
+#     fi
+#   fi
+
+  # documentation gets installed here
   docdir="/usr/share/doc"
 
   if [ ! -w ${docdir} ]; then
@@ -289,7 +299,7 @@
       fi
     fi
   else
-      echo "Cool, you don't have any preexisting installations of Gnash"
+      echo "Cool, you don\'t have any preexisting installations of Gnash"
   fi
 
   return `true`
@@ -303,23 +313,31 @@
 {
   # install the NSAPI (Mozilla/Firefox) plugin
   if [ -e plugins/libgnashplugin.so -o x$yes = xyes ]; then
-    ${COPY} libgnashplugin.so ${nsapidir}
+    ${COPY} lplugins/ibgnashplugin.so ${nsapidir}
   else
     echo "You don't have the NSAPI plugin, installation can't continue"
     exit
   fi
 
   # install the Kparts (KDE/Konqueror) plugin
-  if [ -e plugins/libklashpart.so -o x$yes = xyes ]; then
-    ${COPY} plugins/libklashpart.so ${kpartsplugindir}
+  if [ -e lib/kde3/libklashpart.so -o x$yes = xyes ]; then
+    ${COPY} lib/kde3/libklashpart.so ${kpartsplugindir}
   else
     echo "You don't have the Kparts plugin, installation can't continue"
     exit
   fi
 
   # install the libraries
-  if [ -e lib/libgnashbase.so -o x$yes = xyes ]; then
-    ${COPY} lib/libgnash*.so /usr/lib/
+  if [ -e lib/gnash/libgnashbase.so -o x$yes = xyes ]; then
+    for i in lib/gnash/libgnash*cvs.so; do
+      ${COPY} $i /usr/lib/
+      linkname=`echo $i | sed -e 's:\-.*.so:.so:' -e 's:\.3.*::'`
+      linkname=`basename ${linkname}`
+      ln -fs /usr/lib/`basename $i` /usr/lib/${linkname}
+    done
+    ${COPY} lib/gnash/libltdl.so.3.* /usr/lib/
+    ln -fs /usr/lib/libltdl.so.3.1.4 /usr/lib/libltdl.so.3
+    ln -fs /usr/lib/libltdl.so.3.1.4 /usr/lib/libltdl.so
   else
     echo "You don't have the Gnash libraries, installation can't continue"
     exit
@@ -333,18 +351,19 @@
     exit
   fi
 
-  if [ -e dumpshm -o x$yes = xyes ]; then
-    ${COPY} gprocessor dumpshm soldumper /usr/bin/
-  else
-    echo "You don't have the Gnsh utilities, installation can't continue"
-    exit
-  fi
-
   # install the documentation
   if [ -e gnash.pdf -o x$yes = xyes ]; then
     $debug mkdir -p /usr/share/doc/gnash
     ${COPY} gnash.pdf /usr/share/doc/gnash
   fi
+
+  # copy the ld.so.conf file
+#   if [ ! -f /etc/ld.so.conf.d/gnash.conf ]; then
+#     echo " /usr/lib/gnash" > /etc/ld.so.conf.d/gnash.conf
+#   fi
+
+#   # run ldconfig so the shared libraries can be found.
+#   ldconfig
 }
 
 #

Index: snapshot.am
===================================================================
RCS file: /sources/gnash/gnash/packaging/snapshot.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- snapshot.am 10 Feb 2008 06:19:19 -0000      1.2
+++ snapshot.am 10 Feb 2008 06:49:50 -0000      1.3
@@ -95,6 +95,7 @@
        if test ! -d $${snapshot_tmp}; then \
          $(MKINSTALLDIRS) $${snapshot_tmp}; \
        fi; \
+       rm -f $${snapshot_dest}/usr/lib/*.la; \
        cp @srcdir@/COPYING $${snapshot_tmp}; \
        cp @srcdir@/config.guess $${snapshot_tmp}; \
        cp @srcdir@/packaging/install-gnash.sh $${snapshot_tmp}; \