--- Makefile.orig	Mon Nov 24 13:33:39 2014
+++ Makefile	Mon Dec  8 19:21:29 2014
@@ -1,29 +1,29 @@
 .SUFFIXES:
 
 DESTDIR=
-prefix=/usr/local
+prefix=$(TRUEPREFIX)
 bindir=$(prefix)/bin
 mandir=$(prefix)/man
 man1dir=$(mandir)/man1
 sharedir=$(prefix)/share
-getoptdir=$(sharedir)/getopt
+getoptdir=$(sharedir)/examples/gnugetopt
 localedir=$(sharedir)/locale
 
 # Define this to 0 to use the getopt(3) routines in this package.
-LIBCGETOPT=1
+LIBCGETOPT=0
 
 # Define this to 1 if you do not have the gettext routines
 WITHOUT_GETTEXT=0
 
 # For creating the archive
-PACKAGE=getopt
+PACKAGE=gnugetopt
 VERSION=1.1.6
 BASENAME=$(PACKAGE)-$(VERSION)
 UNLIKELYNAME=a8vwjfd92
 
 SHELL=/bin/sh
 
-CC=gcc
+CC?=gcc
 LD=ld
 RM=rm -f
 INSTALL=install
@@ -32,7 +32,7 @@ MSGFMT=msgfmt
 LANGUAGES = ca cs da de es et eu fi fr gl hr 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) -DWITHOUT_GETTEXT=$(WITHOUT_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
@@ -42,8 +42,6 @@ WARNINGS=-Wall \
          -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline
 OPTIMIZE=-O3 -fno-strength-reduce
-CFLAGS=$(WARNINGS) $(OPTIMIZE)
-LDFLAGS=
 
 sources=getopt.c
 ifeq ($(LIBCGETOPT),0)
@@ -61,14 +59,12 @@ clean: clean_po
 	-$(RM) $(objects) $(binaries) 
 
 getopt: $(objects)
-	$(CC) $(LDFLAGS) -o $@ $(objects)
+	$(CC) $(LDFLAGS) -o $@ $(objects) $(LIBS)
 
 install: getopt install_po
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
-	$(INSTALL) -m 755 getopt $(DESTDIR)$(bindir)
-	$(INSTALL) -m 644 getopt.1 $(DESTDIR)$(man1dir)
-
-install_doc:
+	$(INSTALL) -m 755 getopt $(DESTDIR)$(bindir)/$(PACKAGE)
+	$(INSTALL) -m 644 getopt.1 $(DESTDIR)$(man1dir)/$(PACKAGE).1
 	$(INSTALL) -m 755 -d $(DESTDIR)$(getoptdir)
 	$(INSTALL) -m 755 getopt-parse.bash getopt-parse.tcsh \
 	                  getopt-test.bash getopt-test.tcsh \