--- Makefile.orig	Sun Apr 15 14:17:58 2007
+++ Makefile	Sat Jun 16 12:00:33 2007
@@ -90,7 +90,7 @@
 ctrlproxy.pc Makefile.settings: configure Makefile.settings.in ctrlproxy.pc.in
 	./$<
 
-install: all install-dirs install-bin install-header install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
+install: all install-dirs install-bin install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
 install-dirs:
 	$(INSTALL) -d $(DESTDIR)$(modulesdir)
 
@@ -113,8 +113,6 @@
 
 install-doc:: doc
 	$(INSTALL) -d $(DESTDIR)$(docdir)
-	$(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir)
-	$(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION)
 
 uninstall-doc: 
 	$(MAKE) -C doc uninstall
@@ -146,8 +144,8 @@
 	-rmdir $(DESTDIR)$(modulesdir)
 
 install-pkgconfig:
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
+	$(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
 
 uninstall-pkgconfig:
 	-rm -f $(DESTDIR)$(libdir)/pkgconfig/ctrlproxy.pc