--- opie-2.32.dfsg.1.orig/Makefile.in
+++ opie-2.32.dfsg.1/Makefile.in
@@ -78,7 +78,7 @@
 # GROUP is the groupname associated with the OPIE binaries.
 #
 OWNER=0
-GROUP=bin
+GROUP=0
 
 #  Where should the OPIE standard and extended databases be stored?
 #
@@ -118,7 +118,7 @@
 
 BACKUP=opie.old
 
-CFLAGS=$(DEBUG)
+CFLAGS=$(DEBUG) -fPIC
 
 LFLAGS=-Llibopie -Llibmissing -lopie $(LIBS) -lmissing -lopie
 LDEPS=libmissing/libmissing.a libopie/libopie.a
@@ -140,13 +140,10 @@
 	@echo "Changing file permissions"
 	@chmod 0511 $(LOCALBIN)/opiekey
 	@echo "Symlinking aliases to opiekey"
-	@-ln -s $(LOCALBIN)/opiekey $(LOCALBIN)/otp-md4
-	@-ln -s $(LOCALBIN)/opiekey $(LOCALBIN)/otp-md5
-	@echo "Installing manual pages"
-	@-for i in otp-md4 otp-md5; do ln -s opiekey.1 $(LOCALMAN)/man1/$$i.1; done
-	@if test ! -d $(LOCALMAN)/man1; then $(MKDIR) $(LOCALMAN)/man1; chmod 755 $(LOCALMAN)/man1; fi; cp opiekey.1 $(LOCALMAN)/man1/opiekey.1; $(CHOWN) $(OWNER) $(LOCALMAN)/man1/opiekey.1; chgrp $(GROUP) $(LOCALMAN)/man1/opiekey.1; chmod 644 $(LOCALMAN)/man1/opiekey.1
+	@-ln -s opiekey $(LOCALBIN)/otp-md4
+	@-ln -s opiekey $(LOCALBIN)/otp-md5
 
-server:	libopie/libopie.a libmissing/libmissing.a opietest-passed opielogin opiesu opiepasswd opieinfo opieftpd opieserv
+server:	libopie/libopie.a libmissing/libmissing.a opietest-passed opiepasswd opieinfo 
 
 server-install: server
 	@echo "Installing OPIE server software..."
@@ -159,32 +156,6 @@
 	@echo "Changing file permissions"
 	@chmod 0555 $(LOCALBIN)/opieinfo
 	@chmod 4511 $(LOCALBIN)/opiepasswd
-	@echo "Installing OPIE system programs..."
-	@if test ! $(EXISTS) $(LOGIN).$(BACKUP); then echo "Renaming existing $(LOGIN) to $(LOGIN).$(BACKUP)"; mv $(LOGIN) $(LOGIN).$(BACKUP); echo "Clearing permissions on old $(LOGIN)"; chmod 0 $(LOGIN).$(BACKUP); fi
-	@echo "Copying opielogin to $(LOGIN)"
-	@cp opielogin $(LOGIN)
-	@echo "Changing ownership of $(LOGIN)"
-	@$(CHOWN) $(OWNER) $(LOGIN)
-	@chgrp $(GROUP) $(LOGIN)
-	@echo "Changing file permissions of $(LOGIN)"
-	@chmod 4111 $(LOGIN)
-	@if test ! $(EXISTS) $(SU).$(BACKUP); then echo "Renaming existing su to su.$(BACKUP)"; mv $(SU) $(SU).$(BACKUP); echo "Clearing permissions on old su"; chmod 0 $(SU).$(BACKUP); fi
-	@-if test ! -z "$(ALT_SU)"; then if test ! $(EXISTS) $(ALT_SU).$(BACKUP); then echo "Renaming existing su to su.$(BACKUP)"; mv $(ALT_SU) $(ALT_SU).$(BACKUP); fi; echo "Copying opiesu to su"; cp opiesu $(ALT_SU); echo "Changing ownership"; $(CHOWN) $(OWNER) $(ALT_SU); chgrp $(GROUP) $(ALT_SU); echo "Changing file permissions"; chmod 4111 $(ALT_SU); echo "Clearning permissions on old su"; chmod 0 $(ALT_SU).$(BACKUP); fi
-	@echo "Copying opiesu to su"
-	@cp opiesu $(SU)
-	@echo "Changing ownership of su"
-	@$(CHOWN) $(OWNER) $(SU)
-	@chgrp $(GROUP) $(SU)
-	@echo "Changing file permissions of su"
-	@chmod 4111 $(SU)
-	@if test ! $(EXISTS) $(FTPD).$(BACKUP); then echo "Renaming existing ftp daemon to $(FTPD).$(BACKUP)"; mv $(FTPD) $(FTPD).$(BACKUP); echo "Clearing permissions on old ftp daemon"; chmod 0 $(FTPD).$(BACKUP); fi
-	@echo "Copying OPIE ftp daemon"
-	@cp opieftpd $(FTPD)
-	@echo "Changing ownership of ftpd"
-	@$(CHOWN) $(OWNER) $(FTPD)
-	@chgrp $(GROUP) $(FTPD)
-	@echo "Changing file permissions of ftpd"
-	@chmod 0100 $(FTPD)
 	@echo "Making sure OPIE database file exists"
 	@touch $(KEY_FILE)
 	@echo "Changing permissions of OPIE database file"
@@ -193,11 +164,6 @@
 	@$(CHOWN) $(OWNER) $(KEY_FILE)
 	@chgrp $(GROUP) $(KEY_FILE)
 	@-if test ! -z "$(LOCK_DIR)"; then echo "Creating OPIE lock directory"; mkdir $(LOCK_DIR); $(CHOWN) 0 $(LOCK_DIR); chgrp 0 $(LOCK_DIR); chmod 0700 $(LOCK_DIR); fi;
-	@-if test ! -z "$(ACCESS_FILE)"; then echo "Creating OPIE access file (don't say we didn't warn you)"; touch $(ACCESS_FILE); $(CHOWN) 0 $(ACCESS_FILE); chgrp 0 $(ACCESS_FILE); chmod 0444 $(ACCESS_FILE); fi;
-	@echo "Installing manual pages"
-	@if test ! -d $(LOCALMAN); then $(MKDIR) $(LOCALMAN); chmod 755 $(LOCALMAN); fi
-	@for i in 1 4 5 8; do for j in *.$$i; do if test ! -d $(LOCALMAN)/man$$i; then $(MKDIR) $(LOCALMAN)/man$$i; chmod 755 $(LOCALMAN)/man$$i; fi; cp $$j $(LOCALMAN)/man$$i/$$j; $(CHOWN) $(OWNER) $(LOCALMAN)/man$$i/$$j; chgrp $(GROUP) $(LOCALMAN)/man$$i/$$j; chmod 644 $(LOCALMAN)/man$$i/$$j; done; done
-	@echo "REMEMBER to run opiepasswd on your users immediately."
 
 install: client-install server-install
 
@@ -220,7 +186,7 @@
 	@echo "Please verify by hand that this process worked."
 
 opietest-passed:	opietest
-	-./opietest && touch opietest-passed
+	./opietest && touch opietest-passed
 
 libopie/libopie.a: libopie/*.c *.h
 	(cd libopie ; $(MAKE) libopie.a CFL='$(CFLAGS) -DKEY_FILE=\"$(KEY_FILE)\"')