Index: /trunk/psModules/psmodules-config.in
===================================================================
--- /trunk/psModules/psmodules-config.in	(revision 8989)
+++ /trunk/psModules/psmodules-config.in	(revision 8990)
@@ -4,5 +4,5 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/@PACKAGE_NAME@
 
 usage()
Index: /trunk/psModules/psmodules.pc.in
===================================================================
--- /trunk/psModules/psmodules.pc.in	(revision 8989)
+++ /trunk/psModules/psmodules.pc.in	(revision 8990)
@@ -2,7 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/@PACKAGE_NAME@
 
-Name: psmodules
+Name: @PACKAGE_NAME@
 Description: Pan-STARRS Module Library
 Version: @VERSION@
Index: /trunk/psModules/src/Makefile.am
===================================================================
--- /trunk/psModules/src/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/Makefile.am	(revision 8990)
@@ -7,5 +7,5 @@
 libpsmodules_la_DEPENDENCIES = $(SRCSUBLIBS)
 
-include_HEADERS = \
+pkginclude_HEADERS = \
 	psmodules.h
 
Index: /trunk/psModules/src/astrom/Makefile.am
===================================================================
--- /trunk/psModules/src/astrom/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/astrom/Makefile.am	(revision 8990)
@@ -7,6 +7,5 @@
 	pmAstrometryDistortion.c
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
 	pmAstrometryObjects.h \
 	pmAstrometryDistortion.h
Index: /trunk/psModules/src/camera/Makefile.am
===================================================================
--- /trunk/psModules/src/camera/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/camera/Makefile.am	(revision 8990)
@@ -23,6 +23,5 @@
 	pmFPAfileFitsIO.c
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
 	pmFPA.h \
 	pmFPAConstruct.h \
Index: /trunk/psModules/src/concepts/Makefile.am
===================================================================
--- /trunk/psModules/src/concepts/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/concepts/Makefile.am	(revision 8990)
@@ -11,6 +11,5 @@
 	pmConceptsPhotcode.c
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
 	pmConcepts.h \
 	pmConceptsAverage.h \
Index: /trunk/psModules/src/config/Makefile.am
===================================================================
--- /trunk/psModules/src/config/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/config/Makefile.am	(revision 8990)
@@ -6,6 +6,5 @@
     pmConfig.c
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
     pmConfig.h
 
Index: /trunk/psModules/src/detrend/Makefile.am
===================================================================
--- /trunk/psModules/src/detrend/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/detrend/Makefile.am	(revision 8990)
@@ -17,6 +17,5 @@
 #	pmSubtractSky.c
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
 	pmFlatField.h \
 	pmFlatFieldErrors.h \
Index: /trunk/psModules/src/imcombine/Makefile.am
===================================================================
--- /trunk/psModules/src/imcombine/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/imcombine/Makefile.am	(revision 8990)
@@ -9,6 +9,5 @@
      pmReadoutCombine.c
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
     pmImageCombine.h \
     pmImageSubtract.h \
Index: /trunk/psModules/src/objects/Makefile.am
===================================================================
--- /trunk/psModules/src/objects/Makefile.am	(revision 8989)
+++ /trunk/psModules/src/objects/Makefile.am	(revision 8990)
@@ -31,6 +31,5 @@
 	models/pmModel_SGAUSS.c 
 
-psmodulesincludedir = $(includedir)
-psmodulesinclude_HEADERS = \
+pkginclude_HEADERS = \
      pmPeaks.h \
      pmMoments.h \