[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./mkinstalldirs plugin/Makefi...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog ./mkinstalldirs plugin/Makefi... |
Date: |
Fri, 10 Mar 2006 15:15:13 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/03/10 15:15:13
Modified files:
. : ChangeLog mkinstalldirs
plugin : Makefile.am
utilities : Makefile.am
Log message:
* plugin/Makefile.am: Use DESTDIR when making directory.
* mkinstalldirs: Add so we have it when not using the install
utility (using libtool) to make directories.
* utilities/Makefile.am: Add ZLIB_LIBS to ldflags.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.183&tr2=1.184&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/mkinstalldirs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.183 gnash/ChangeLog:1.184
--- gnash/ChangeLog:1.183 Thu Mar 9 21:33:45 2006
+++ gnash/ChangeLog Fri Mar 10 15:15:13 2006
@@ -1,3 +1,10 @@
+2006-03-10 Rob Savoye <address@hidden>
+
+ * plugin/Makefile.am: Use DESTDIR when making directory.
+ * mkinstalldirs: Add so we have it when not using the install
+ utility (using libtool) to make directories.
+ * utilities/Makefile.am: Add ZLIB_LIBS to ldflags.
+
2006-03-09 Michael Carlson <address@hidden>
* server/array.cpp: Add TODO to make sort constants static
Index: gnash/mkinstalldirs
diff -u gnash/mkinstalldirs:1.1 gnash/mkinstalldirs:1.2
--- gnash/mkinstalldirs:1.1 Thu Jan 19 23:50:11 2006
+++ gnash/mkinstalldirs Fri Mar 10 15:15:13 2006
@@ -1,40 +1,150 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <address@hidden>
-# Created: 1993-05-16
-# Public domain
-# $Id: mkinstalldirs,v 1.1 2006/01/19 23:50:11 rsavoye Exp $
+scriptversion=2005-02-02.21
+
+# Original author: Noah Friedman <address@hidden>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <address@hidden> or send patches to
+# <address@hidden>.
errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <address@hidden>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage"
+ exit $?
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+done
+
+for file
+do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+ 0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error. This is a problem when calling mkinstalldirs
+# from a parallel make. We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+ '')
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
+ fi
+ ;;
+esac
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
- fi
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
- pathcomp="$pathcomp/"
- done
+ pathcomp="$pathcomp/"
+ done
done
exit $errstatus
-# mkinstalldirs ends here
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.15 gnash/plugin/Makefile.am:1.16
--- gnash/plugin/Makefile.am:1.15 Thu Mar 9 19:29:06 2006
+++ gnash/plugin/Makefile.am Fri Mar 10 15:15:13 2006
@@ -122,7 +122,7 @@
# installed in the users $(HOME)/.firefox.plugins, the plugin
# won't load due to errors with an undefined MaiAtkObject.
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- test -d "$(plugindir)" || mkdir "$(DESTDIR)$(plugindir)"
+ test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs)
"$(DESTDIR)$(plugindir)"
# cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG)
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.11 gnash/utilities/Makefile.am:1.12
--- gnash/utilities/Makefile.am:1.11 Mon Mar 6 01:43:25 2006
+++ gnash/utilities/Makefile.am Fri Mar 10 15:15:13 2006
@@ -32,6 +32,7 @@
../server/libgnashasobjs.la \
../libgeometry/libgnashgeo.la \
../libbase/libgnashbase.la
+ $(ZLIB_LIBS)
INCLUDES = -I.. \
-I$(top_srcdir) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./mkinstalldirs plugin/Makefi...,
Rob Savoye <=