--- Makefile.orgi	2008-12-24 19:32:32.000000000 +0100
+++ Makefile	2008-12-24 19:33:58.000000000 +0100
@@ -1,6 +1,9 @@
-prefix = /usr
+prefix = %%PREFIX%%
 
-CFLAGS = -g -O2
+LDFLAGS+=-L%%LOCALBASE%%/lib -lintl
+CFLAGS+=-I%%LOCALBASE%%/include
+
+CFLAGS += -g -O2
 
 PERL = perl
 INSTALL = install
@@ -21,7 +24,7 @@
 endif
 
 ifdef LOCALEDIR
-DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\"
+DEFS += -DLOCALEDIR=\"$(prefix)/share/locale\"
 endif
 
 ifdef HAVE_LIBIDN
@@ -68,19 +71,19 @@
 	$(PERL) -w make_tld_serv.pl < tld_serv_list > $@
 
 ##############################################################################
-install: install-whois install-mkpasswd #install-pos
+install: install-whois install-mkpasswd
 
 install-whois: whois
-	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
-	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
-	$(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/
-	$(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
+	$(INSTALL) -d $(prefix)/bin/
+	$(INSTALL) -d $(prefix)/man/man1/
+	$(INSTALL) -m 0755 whois $(prefix)/bin/mwhois
+	$(INSTALL) -m 0644 whois.1 $(prefix)/man/man1/mwhois.1
 
 install-mkpasswd: mkpasswd
-	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
-	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
-	$(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
-	$(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
+	$(INSTALL) -d $(prefix)/bin/
+	$(INSTALL) -d $(prefix)/man/man1/
+	$(INSTALL) -m 0755 mkpasswd $(prefix)/bin/
+	$(INSTALL) -m 0644 mkpasswd.1 $(prefix)/man/man1/
 
 install-pos:
 	cd po && $(MAKE) install