Apply Project Standard Autogen 0.4.2
authormartyj19 <martyj19@comcast.net>
Sun, 5 Jul 2009 21:43:25 +0000 (21:43 +0000)
committermartyj19 <martyj19@comcast.net>
Sun, 5 Jul 2009 21:43:25 +0000 (21:43 +0000)
Fix one typo in icon-theme makefile
Release 0.4.2

autogen.sh
configure.ac
icon-theme/Makefile.am

index dc17bac..093af93 100755 (executable)
@@ -1,7 +1,18 @@
 #! /bin/sh
-AM_VERSION=-1.10
 AC_VERSION=
 
+AUTOMAKE=${AUTOMAKE:-automake}
+AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
+
+if [ "$AM_INSTALLED_VERSION" != "1.10" \
+    -a "$AM_INSTALLED_VERSION" != "1.11" ];then
+       echo
+       echo "You must have automake > 1.10 or 1.11 installed to compile lxde-common."
+       echo "Install the appropriate package for your distribution,"
+       echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+       exit 1
+fi
+
 set -x
 
 if [ "x${ACLOCAL_DIR}" != "x" ]; then
@@ -9,13 +20,13 @@ if [ "x${ACLOCAL_DIR}" != "x" ]; then
 fi
 
 ${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
-#${AUTOHEADER:-autoheader$AC_VERSION}
-# AUTOMAKE=${AUTOMAKE:-automake$AM_VERSION} libtoolize -c --automake --force
-# AUTOMAKE=${AUTOMAKE:-automake$AM_VERSION} intltoolize -c --automake --force
-${AUTOMAKE:-automake$AM_VERSION} --add-missing --copy --include-deps
+${AUTOHEADER:-autoheader$AC_VERSION} --force
+AUTOMAKE=$AUTOMAKE libtoolize -c --automake --force
+AUTOMAKE=$AUTOMAKE intltoolize -c --automake --force
+$AUTOMAKE --add-missing --copy --include-deps
 ${AUTOCONF:-autoconf$AC_VERSION}
 
 # mkinstalldirs was not correctly installed in some cases.
-cp -f /usr/share/automake-1.10/mkinstalldirs .
+cp -f /usr/share/${AUTOMAKE}-*/mkinstalldirs .
 
 rm -rf autom4te.cache
index b876b4b..e111c8c 100644 (file)
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(lxde-common,[0.4.1], [],lxde-common)
+AC_INIT(lxde-common,[0.4.2], [],lxde-common)
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 dnl AC_PROG_INTLTOOL(, [no-xml])
 dnl AM_MAINTAINER_MODE
index 78bca0e..48d63a5 100644 (file)
@@ -10,7 +10,7 @@ uninstall-hook:
 install-data-hook:
        $(mkdir_p) $(DESTDIR)$(datadir)/icons
        cp -raf --no-preserve=ownership nuoveXT2 $(DESTDIR)$(datadir)/icons
-       $(LN_S) -f -f preferences-desktop.png $(DESTDIR)$(datadir)/icons/nuoveXT2/128x128/categories/xfce4-settings.png
+       $(LN_S) -f preferences-desktop.png $(DESTDIR)$(datadir)/icons/nuoveXT2/128x128/categories/xfce4-settings.png
        $(LN_S) -f preferences-desktop.png $(DESTDIR)$(datadir)/icons/nuoveXT2/128x128/categories/gnome-settings.png
        $(LN_S) -f preferences-desktop.png $(DESTDIR)$(datadir)/icons/nuoveXT2/128x128/categories/kcontrol.png
        $(LN_S) -f preferences-desktop.png $(DESTDIR)$(datadir)/icons/nuoveXT2/128x128/categories/gnome-control-center.png