diff -NarU5 pubcookie-3.3.3.orig/Makefile.in pubcookie-3.3.3/Makefile.in
--- pubcookie-3.3.3.orig/Makefile.in	2007-09-06 19:01:24.000000000 -0400
+++ pubcookie-3.3.3/Makefile.in	2009-03-18 11:10:02.000000000 -0400
@@ -13,19 +13,21 @@
 MAKE_APACHE=@MAKE_APACHE@$(MAKE)
 
 CC=@CC@
 
 prefix=@prefix@
+localstatedir=@localstatedir@
+sbindir=@sbindir@
+datadir=@datadir@
 srcdir=@srcdir@
 builddir=@builddir@
 
-PUBCOOKIE_DIR=$(prefix)
-KEY_DIR=$(PUBCOOKIE_DIR)/keys
-TEMPLATE_DIR=$(PUBCOOKIE_DIR)/login_templates
-LOGIN_DIR=$(PUBCOOKIE_DIR)/login
-CERT_DB_DIR=$(PUBCOOKIE_DIR)/keys
-LOGIN_MEDIA_DIR=$(PUBCOOKIE_DIR)/login/media
+PUBCOOKIE_DIR=$(DESTDIR)/$(prefix)
+SBIN_DIR=$(DESTDIR)/$(sbindir)
+KEY_DIR=$(DESTDIR)/$(localstatedir)/lib/pubcookie
+TEMPLATE_DIR=$(DESTDIR)/$(datadir)/pubcookie/login_templates
+CGI_DIR=$(DESTDIR)/$(datadir)/pubcookie/cgi-bin
 
 CERT_DB_SOURCE=@CERT_DB_PATH@
 
 INSTALL=@INSTALL@
 INSTALL_BIN=$(INSTALL) -m 755
@@ -372,83 +374,55 @@
 
 
 # Installation Targets
 
 install: $(KEY_DIR) @install_login@ @install_apache@ 
-@IF_MOD@	$(INSTALL_BIN) keyclient $(PUBCOOKIE_DIR)
+@IF_MOD@	$(INSTALL_BIN) keyclient $(SBIN_DIR)
 
-install-login: @no_login@ $(LOGIN_DIR) $(TEMPLATE_DIR) $(TEMPLATE_DIR).default $(LOGIN_TEMPLATES) $(LOGIN_MEDIA_DIR) $(TEMPLATE_DIR).default/media $(LOGIN_MEDIA) login_server
+install-login: @no_login@ $(SBIN_DIR) $(TEMPLATE_DIR) $(CGI_DIR) $(LOGIN_TEMPLATES) $(TEMPLATE_DIR)/media login_server
 	@for file in $(INDEX_FILES); do \
-		echo $(INSTALL_BIN) $$file $(LOGIN_DIR); \
-		$(INSTALL_BIN) $$file $(LOGIN_DIR); \
+		echo $(INSTALL_BIN) $$file $(CGI_DIR); \
+		$(INSTALL_BIN) $$file $(CGI_DIR); \
 	done
 	@for file in $(LOGIN_TEMPLATES); do \
-		echo $(INSTALL_OTHER) $$file $(TEMPLATE_DIR).default; \
-		$(INSTALL_OTHER) $$file $(TEMPLATE_DIR).default; \
-	done
-	@for file in $(LOGIN_TEMPLATES); do \
-		bfile=`basename $$file`; \
-		$(TEST) ! -f $(TEMPLATE_DIR)/$$bfile && \
-		 	echo $(INSTALL_OTHER) $$file $(TEMPLATE_DIR) && \
-			$(INSTALL_OTHER) $$file $(TEMPLATE_DIR); \
-		true; \
+		echo $(INSTALL_OTHER) $$file $(TEMPLATE_DIR); \
+		$(INSTALL_OTHER) $$file $(TEMPLATE_DIR); \
 	done
 	@for file in $(LOGIN_MEDIA); do \
-		echo $(INSTALL_OTHER) $$file $(TEMPLATE_DIR).default/media; \
-		$(INSTALL_OTHER) $$file $(TEMPLATE_DIR).default/media; \
-	done
-	@for file in $(LOGIN_MEDIA); do \
-		bfile=`basename $$file`; \
-		$(TEST) ! -f $(LOGIN_MEDIA_DIR)/$$bfile && \
-			echo $(INSTALL_OTHER) $$file $(LOGIN_MEDIA_DIR) && \
-			$(INSTALL_OTHER) $$file $(LOGIN_MEDIA_DIR); \
-		true; \
+		echo $(INSTALL_OTHER) $$file $(TEMPLATE_DIR)/media; \
+		$(INSTALL_OTHER) $$file $(TEMPLATE_DIR)/media; \
 	done
 	@for file in $(KEYMGT_FILES); do \
-		echo $(INSTALL_BIN) $$file $(PUBCOOKIE_DIR); \
-		$(INSTALL_BIN) $$file $(PUBCOOKIE_DIR); \
-	done
-	@for file in $(CERT_DB_SOURCE)/cert7.db $(CERT_DB_SOURCE)/key3.db; do \
-		$(TEST) "x$(CERT_DB_SOURCE)" != "x" && \
-			echo $(INSTALL_OTHER) $$file $(CERT_DB_DIR) && \
-			$(INSTALL_OTHER) $$file $(CERT_DB_DIR); \
-		true; \
+		echo $(INSTALL_BIN) $$file $(SBIN_DIR); \
+		$(INSTALL_BIN) $$file $(SBIN_DIR); \
 	done
-	$(INSTALL_OTHER) doc/starter.key $(PUBCOOKIE_DIR)
-	$(INSTALL_OTHER) doc/config.login.sample $(PUBCOOKIE_DIR)
-	@$(TEST) ! -f $(PUBCOOKIE_DIR)/config && \
-		echo $(INSTALL_OTHER) doc/config.login.sample \
-			 $(PUBCOOKIE_DIR)/config && \
-		$(INSTALL_OTHER) doc/config.login.sample $(PUBCOOKIE_DIR)/config; \
-		true
+	$(INSTALL_OTHER) doc/starter.key $(KEY_DIR)
 
 install-apache: @no_module@
 	@echo "Making all in module"
 	(cd module; $(MAKE) install)
 
 $(PUBCOOKIE_DIR):
 	$(INSTALL_DIR) $(PUBCOOKIE_DIR)
 
+$(SBIN_DIR): $(PUBCOOKIE_DIR)
+	$(INSTALL_DIR) $(SBIN_DIR)
+
 $(KEY_DIR): $(PUBCOOKIE_DIR)
 	$(INSTALL_DIR) $(KEY_DIR)
 
-$(LOGIN_DIR): $(PUBCOOKIE_DIR)
-	$(INSTALL_DIR) $(LOGIN_DIR)
-
 #$(LOGIN_IMG_DIR): $(PUBCOOKIE_DIR)
 #	$(INSTALL_DIR) $(LOGIN_IMG_DIR)
-$(LOGIN_MEDIA_DIR): $(PUBCOOKIE_DIR)
-	$(INSTALL_DIR) $(LOGIN_MEDIA_DIR)
+
+$(CGI_DIR): $(PUBCOOKIE_DIR)
+	$(INSTALL_DIR) $(CGI_DIR)
 
 $(TEMPLATE_DIR): $(PUBCOOKIE_DIR)
 	$(INSTALL_DIR) $(TEMPLATE_DIR)
 
-$(TEMPLATE_DIR).default: $(PUBCOOKIE_DIR)
-	$(INSTALL_DIR) $(TEMPLATE_DIR).default
-
-$(TEMPLATE_DIR).default/media: $(TEMPLATE_DIR).default
-	$(INSTALL_DIR) $(TEMPLATE_DIR).default/media
+$(TEMPLATE_DIR)/media: $(TEMPLATE_DIR)
+	$(INSTALL_DIR) $(TEMPLATE_DIR)/media
 
 $(LIB_OBJ): $(LIB_HEAD) $(builddir)/src/pbc_path.h $(srcdir)/src/pbc_version.h.in $(builddir)/src/config.h
 
 # Test Targets
 
diff -NarU5 pubcookie-3.3.3.orig/src/pbc_path.h.in pubcookie-3.3.3/src/pbc_path.h.in
--- pubcookie-3.3.3.orig/src/pbc_path.h.in	2007-09-06 19:01:24.000000000 -0400
+++ pubcookie-3.3.3/src/pbc_path.h.in	2009-03-18 11:10:48.000000000 -0400
@@ -31,18 +31,18 @@
 #define PBC_PATH (libpbc_config_getstring(p, "pbc_path", "@prefix@/"))
 /* the login server builds it's key Filenames from the hostname     */
 #if defined (WIN32)
 #  define PBC_KEY_DIR (AddSystemRoot("\\inetsrv\\pubcookie\\keys"))
 #else
-#  define PBC_KEY_DIR (libpbc_config_getstring(p, "keydir", "@prefix@/keys"))
+#  define PBC_KEY_DIR (libpbc_config_getstring(p, "keydir", "@localstatedir@/lib/pubcookie"))
 #endif
 
 /* where the runtime configuration file lives */
-#define PBC_CONFIG "@prefix@/config"
+#define PBC_CONFIG "@sysconfdir@/pubcookie/config"
 
 /* Where to find templates */
-#define TMPL_FNAME (libpbc_config_getstring(p, "template_root", "@prefix@/login_templates"))
+#define TMPL_FNAME (libpbc_config_getstring(p, "template_root", "@datadir@/pubcookie/login_templates"))
 
 /* suffix for seperate config files for components */
 #define PBC_SUBCONFIG (libpbc_config_getstring(p, "subconfig_suffix", ".conf"))
 
 /* file to get the list of ok browsers from */
@@ -54,14 +54,14 @@
 /* getcred authz file */
 #define GETCRED_AUTHZ (libpbc_config_getstring(p, "getcred_authz_file", "@prefix@/getcred_authz"))
 
 /* The keyclient.  This is probably better defined elsewhere, but I dunno. */
 
-#define KEYCLIENT (libpbc_config_getstring(p, "keyclient", "@prefix@/keyclient"))
+#define KEYCLIENT (libpbc_config_getstring(p, "keyclient", "@sbindir@/keyclient"))
 
 /* The path to the cert db, if this is using the Netscape SDK */
 
-#define CERT_DB_PATH (libpbc_config_getstring(p, "cert_db_path", "@prefix@/keys"))
+#define CERT_DB_PATH (libpbc_config_getstring(p, "cert_db_path", "@localstatedir@/lib/pubcookie"))
 
 #define SHADOW_PATH (libpbc_config_getstring(p, "shadow_path", "/etc/shadow"))
 
 #endif