Don't require KDE to be installed for "make dist".

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 6e39eb9b933ff7df3a1b58035321f08a0bc2ecd0..5eb636b54179d678a134a2e0b4ec79b719f7ab4f 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-10  Bruno Haible  <bruno@clisp.org>
+
+       * hello-c++-kde/admin: New directory, from KDE 3.1.4.
+       * hello-c++-kde/auto*.sh: Don't create/remove the contents of the
+       admin subdirectory.
+
 2004-01-10  Bruno Haible  <bruno@clisp.org>
 
        * hello-c/*, hello-c-gnome/*, hello-objc/*, hello-objc-gnome/*,

diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh
index 386eb368500fc699eb5ec2fa0cae9b73a89bbea4..e4c32b7c5ffe32dec3225a3c6ee4759cafd6d0b2 100755 (executable)
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -7,6 +7,13 @@
 
 test ! -f Makefile || make distclean
 
+if "$1" = fromscratch; then
+
+  # Brought in by explicit copy.
+  rm -rf admin
+
+fi
+
 # Brought in by autopoint.
 rm -f ABOUT-NLS
 rm -f m4/codeset.m4
@@ -39,9 +46,7 @@ rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
-
-# Brought in by explicit copy.
-rm -rf admin
+rm -f admin/config.rpath
 
 # Generated through admin/cvs.sh.
   rm -f acinclude.m4

diff --git a/gettext-tools/examples/hello-c++-kde/autogen.sh b/gettext-tools/examples/hello-c++-kde/autogen.sh
index e9a8aef656a4c5c12afedeadf91553eb033e0d5f..aec54bee116cfa63da568f72459952583ba82af6 100755 (executable)
--- a/gettext-tools/examples/hello-c++-kde/autogen.sh
+++ b/gettext-tools/examples/hello-c++-kde/autogen.sh
@@ -1,26 +1,30 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for regenerating all autogenerated files.
 
-kdedir=
-for d in /usr/lib/kde /usr/local/kde /usr/local /usr/kde /usr /opt/kde3 /opt/kde /suse/opt/kde3 $KDEDIR; do
-  if test -f $d/share/apps/kdelibs/admin/cvs.sh; then
-    kdedir=$d
-    break
+if test "$1" = fromscratch; then
+
+  kdedir=
+  for d in /usr/lib/kde /usr/local/kde /usr/local /usr/kde /usr /opt/kde3 /opt/kde /suse/opt/kde3 $KDEDIR; do
+    if test -f $d/share/apps/kdelibs/admin/cvs.sh; then
+      kdedir=$d
+      break
+    fi
+  done
+  if test -z "$kdedir"; then
+    echo "*** KDE directory not found. Try setting KDEDIR." 1>&2
+    exit 1
   fi
-done
-if test -z "$kdedir"; then
-  echo "*** KDE directory not found. Try setting KDEDIR." 1>&2
-  exit 1
-fi
 
-cp -a $kdedir/share/apps/kdelibs/admin .
-sed -e s/AC_FOREACH/INCOMPATIBLE_FOREACH/g < $kdedir/share/apps/kdelibs/admin/acinclude.m4.in > admin/acinclude.m4.in
-sed -e 's/automake\*1.6/automake\*1.[678]/' < admin/cvs.sh > admin/cvs.sh.new
-mv admin/cvs.sh.new admin/cvs.sh
+  cp -a $kdedir/share/apps/kdelibs/admin .
+  sed -e s/AC_FOREACH/INCOMPATIBLE_FOREACH/g < $kdedir/share/apps/kdelibs/admin/acinclude.m4.in > admin/acinclude.m4.in
+  sed -e 's/automake\*1.6/automake\*1.[678] | automake\*1.[678]/' < admin/cvs.sh > admin/cvs.sh.new
+  mv admin/cvs.sh.new admin/cvs.sh
+
+fi
 
 autopoint -f # was: gettextize -f -c
 mv config.rpath admin/config.rpath