From: Bruno Haible <bruno@clisp.org>
Date: Thu, 10 Feb 2005 15:49:07 +0000 (+0000)
Subject: Install gettext.sh as an executable shells script.
X-Git-Tag: v0.14.2~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb869570eecc7aa085abbbc09f72d93dda56139;p=thirdparty%2Fgettext.git

Install gettext.sh as an executable shells script.
---

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 58aa37b90..bc67256b5 100644
--- 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 2a6296304..8a6582570 100644
--- 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 1fc621852..9759225bb 100644
--- 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 0f71803b1..db40a23eb 100644
--- 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 a74d34dee..b8522d969 100644
--- 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 c53527bd2..1cf17c6bf 100644
--- 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'."