Install gettext.sh as an executable shells script.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 58aa37b907a257a7025e85019b8aa2483ca335b7..bc67256b50cd9f189e8b5abb16497ab20fd7aa45 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-10  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Add creation rule for src/gettext.sh.
+
 2005-01-06  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Invoke gl_ERROR instead of gt_FUNC_ERROR_AT_LINE.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 2a6296304f5c8976115b9949d42abdb48fb6d008..8a6582570126c33612e8619e4003c6421987a228 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -159,6 +159,7 @@ AC_CONFIG_FILES([lib/csharpcomp.sh:../gettext-tools/lib/csharpcomp.sh.in])
 
 AC_CONFIG_FILES([src/Makefile],
                 [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([src/gettext.sh], [chmod a+x src/gettext.sh])
 
 AC_CONFIG_FILES([po/Makefile.in])
 

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 1fc6218528e292505147baa5ae4ee647f2b4ae74..9759225bbd24ef860865d331c35fc6ecb51924d5 100644 (file)
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,16 @@
+2005-02-10  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.sh.in: Renamed from gettext.sh. Show help or usage or an
+       error message when invoked as an executable.
+       * Makefile.am (bin_SCRIPTS, DISTCLEANFILES): New variables.
+       (EXTRA_DIST): Remove gettext.sh.
+       (all-local, install-data-local, uninstall-local): Remove rules.
+       * Makefile.msvc (install): Don't install gettext.sh.
+       (uninstall): Don't uninstall gettext.sh.
+       * Makefile.vms (install): Don't install gettext.sh.
+       (uninstall): Don't uninstall gettext.sh.
+       Suggested by Alfred M. Szmidt <ams@kemisten.nu>.
+
 2005-01-05  Bruno Haible  <bruno@clisp.org>
 
        * gettext.c (main): Update year in --version output.

diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index 0f71803b11f998afd21b01a3fe21a6792e55c4f8..db40a23eb068be2a8af2fbc896a50894ea95af7a 100644 (file)
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/src subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2004 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 EXTRA_DIST =
+DISTCLEANFILES =
 
 RM = rm -f
 
@@ -52,15 +53,9 @@ ngettext_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
 envsubst_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif
 
-# Special rule for installing gettext.sh in $(bindir).
-# automake doesn't handle "bin_DATA = gettext.sh".
-EXTRA_DIST += gettext.sh
-all-local: gettext.sh
-install-data-local: all-local
-       $(mkinstalldirs) $(DESTDIR)$(bindir)
-       $(INSTALL_DATA) $(srcdir)/gettext.sh $(DESTDIR)$(bindir)/gettext.sh
-uninstall-local: all-local
-       $(RM) $(DESTDIR)$(bindir)/gettext.sh
+# For installing gettext.sh in $(bindir).
+bin_SCRIPTS = gettext.sh
+DISTCLEANFILES += gettext.sh
 
 # Support for relocatability.
 RELOCATABLE_LIBRARY_PATH = $(libdir)

diff --git a/gettext-runtime/src/Makefile.msvc b/gettext-runtime/src/Makefile.msvc
index a74d34dee7c5ee99fcb599c1197b394cd8d6d65e..b8522d969d3c951476aa768075659ea9311ef84b 100644 (file)
--- a/gettext-runtime/src/Makefile.msvc
+++ b/gettext-runtime/src/Makefile.msvc
@@ -121,7 +121,6 @@ install : all force
        $(INSTALL_PROGRAM) gettext.exe $(bindir)\gettext.exe
        $(INSTALL_PROGRAM) ngettext.exe $(bindir)\ngettext.exe
        $(INSTALL_PROGRAM) envsubst.exe $(bindir)\envsubst.exe
-       $(INSTALL_DATA) gettext.sh $(bindir)\gettext.sh
 
 installdirs : force
        -mkdir $(prefix)
@@ -132,7 +131,6 @@ uninstall : force
        $(RM) $(bindir)\gettext.exe
        $(RM) $(bindir)\ngettext.exe
        $(RM) $(bindir)\envsubst.exe
-       $(RM) $(bindir)\gettext.sh
 
 check : all
 

diff --git a/gettext-runtime/src/Makefile.vms b/gettext-runtime/src/Makefile.vms
index c53527bd23694a542b981c33fcdbc9dd374cae25..1cf17c6bfcab722f32f1e77903efdd6922adb0bd 100644 (file)
--- a/gettext-runtime/src/Makefile.vms
+++ b/gettext-runtime/src/Makefile.vms
@@ -76,7 +76,6 @@ install : all
        $(INSTALL_PROGRAM) gettext.exe $(bindir)]gettext.exe
        $(INSTALL_PROGRAM) ngettext.exe $(bindir)]ngettext.exe
        $(INSTALL_PROGRAM) envsubst.exe $(bindir)]envsubst.exe
-       $(INSTALL_DATA) gettext.sh $(bindir)]gettext.sh
 
 installdirs :
        create /directory $(prefix)]
@@ -87,7 +86,6 @@ uninstall :
        $(RM) $(bindir)]gettext.exe;
        $(RM) $(bindir)]ngettext.exe;
        $(RM) $(bindir)]envsubst.exe;
-       $(RM) $(bindir)]gettext.sh;
 
 check : all
        write sys$output "Nothing else to be done for 'check'."