--- getopt/trunk/Makefile	2012/07/17 17:09:37	323
+++ getopt/trunk/Makefile	2014/11/23 10:50:39	368
@@ -5,9 +5,8 @@
 bindir=$(prefix)/bin
 mandir=$(prefix)/man
 man1dir=$(mandir)/man1
-libdir=$(prefix)/lib
 sharedir=$(prefix)/share
-getoptdir=$(libdir)/getopt
+getoptdir=$(sharedir)/getopt
 localedir=$(sharedir)/locale
 
 # Define this to 0 to use the getopt(3) routines in this package.
@@ -18,7 +17,7 @@
 
 # For creating the archive
 PACKAGE=getopt
-VERSION=1.1.4
+VERSION=1.1.5
 BASENAME=$(PACKAGE)-$(VERSION)
 UNLIKELYNAME=a8vwjfd92
 
@@ -30,10 +29,10 @@
 INSTALL=install
 MSGFMT=msgfmt
 
-LANGUAGES = cs de es fr it ja nl pt_BR
+LANGUAGES = ca cs da de es et eu fi fr gl hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
 MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
 
-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
+CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
 ifeq ($(LIBCGETOPT),0)
 CPPFLAGS+=-I./gnu 
 endif
@@ -75,7 +74,7 @@
 	                  getopt-test.bash getopt-test.tcsh \
 	           $(DESTDIR)$(getoptdir)
 
-ifeq ($(WITH_GETTEXT),1)
+ifeq ($(WITHOUT_GETTEXT),0)
 all_po: $(MOFILES)
 install_po: all_po
 	$(INSTALL) -m 755 -d $(DESTDIR)$(localedir)
@@ -106,3 +105,7 @@
 	ln -s .. $(UNLIKELYNAME)/$(BASENAME)
 	cd $(UNLIKELYNAME) && tar cfvzp ../$(BASENAME).tar.gz --exclude='CVS' --exclude='*.tar.gz' --exclude=$(UNLIKELYNAME) $(BASENAME)/*
 	$(RM) -r $(UNLIKELYNAME)
+
+.PHONY: test
+test: all
+	./run-tests