summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordobey <>2008-07-25 15:48:39 +0000
committerdobey <>2008-07-25 15:48:39 +0000
commit67574d3d992ce587e5d2dd8bb8affc6da4414942 (patch)
tree1c050273db2b790eebb0a34a353a47220d88fbeb
parentf1a2d72ee5850e446ff5bc8c0671e4c37cb02450 (diff)
downloadintltool-67574d3d992ce587e5d2dd8bb8affc6da4414942.tar.gz
2008-07-25 Rodney Dawes <dobey.pwns@gmail.com>
* intltoolize.in: Check for symlinks to intltool scripts and remove them Touch the script.in files for compatibility We just touch the scripts as we no longer generate executable versions, and the Makefile.in.in uses the installed scripts anyway.
-rw-r--r--ChangeLog8
-rw-r--r--intltoolize.in8
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a7f55b..f9f1268 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-25 Rodney Dawes <dobey.pwns@gmail.com>
+
+ * intltoolize.in:
+ Check for symlinks to intltool scripts and remove them
+ Touch the script.in files for compatibility
+ We just touch the scripts as we no longer generate executable versions,
+ and the Makefile.in.in uses the installed scripts anyway.
+
2008-07-23 Rodney Dawes <dobey.pwns@gmail.com>
* doc/I18N-HOWTO:
diff --git a/intltoolize.in b/intltoolize.in
index 8e93c87..4681793 100644
--- a/intltoolize.in
+++ b/intltoolize.in
@@ -196,8 +196,7 @@ if test -z "$automake"; then
fi
-
-# Change to the auxiliary directory.
+# Copy or symlink the Makefile.in.in
(
for file in $files; do
if test -f "$file" && test -z "$force"; then
@@ -212,6 +211,11 @@ for file in $files; do
echo "$progname: cannot copy '$pkgdatadir/`basename $file`' to '$file'" 1>&2
status=1
fi
+# Touch script names for backward compatibility
+ for script in intltool-extract.in intltool-merge.in intltool-update.in; do
+ if test -h $script; then rm -f $script; fi
+ touch $script
+ done
done
exit $status