diff --git a/Appl/CEP/CS1/CS1_BBS/Makefile.am b/Appl/CEP/CS1/CS1_BBS/Makefile.am
index dbe86472c71f325de32956a30e1a4ebaa7618d2e..9f30b37f763cea43be6f87a26c50f283351f0efc 100644
--- a/Appl/CEP/CS1/CS1_BBS/Makefile.am
+++ b/Appl/CEP/CS1/CS1_BBS/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS= \
       --with-common=$(prefix) \
       --with-aips++ 
diff --git a/Appl/CEP/CS1/CS1_BGLProc/Makefile.am b/Appl/CEP/CS1/CS1_BGLProc/Makefile.am
index 158b4942f7a0cbe4f7cc700e74d5ded273f25bab..a4b6490827b8b04d9ef008582ed795b9fc9f083e 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/Makefile.am
+++ b/Appl/CEP/CS1/CS1_BGLProc/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/Appl/CEP/CS1/CS1_DelayCompensation/Makefile.am b/Appl/CEP/CS1/CS1_DelayCompensation/Makefile.am
index 0707c76d4b5754cbfca950d94e01cc447ee1e2ee..9d6b64a7dd008c40f5444610e523538a2f179a4f 100644
--- a/Appl/CEP/CS1/CS1_DelayCompensation/Makefile.am
+++ b/Appl/CEP/CS1/CS1_DelayCompensation/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/Appl/CEP/CS1/CS1_Flagger/Makefile.am b/Appl/CEP/CS1/CS1_Flagger/Makefile.am
index dbe86472c71f325de32956a30e1a4ebaa7618d2e..9f30b37f763cea43be6f87a26c50f283351f0efc 100644
--- a/Appl/CEP/CS1/CS1_Flagger/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Flagger/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS= \
       --with-common=$(prefix) \
       --with-aips++ 
diff --git a/Appl/CEP/CS1/CS1_Generator/Makefile.am b/Appl/CEP/CS1/CS1_Generator/Makefile.am
index 32c7bfd451a7570eb56949b8ee14da3d39d6c1de..cb4b37c5e3ac53b4a1ea9067d335a1a8172027ef 100644
--- a/Appl/CEP/CS1/CS1_Generator/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Generator/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/Appl/CEP/CS1/CS1_Imager/Makefile.am b/Appl/CEP/CS1/CS1_Imager/Makefile.am
index dbe86472c71f325de32956a30e1a4ebaa7618d2e..9f30b37f763cea43be6f87a26c50f283351f0efc 100644
--- a/Appl/CEP/CS1/CS1_Imager/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Imager/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS= \
       --with-common=$(prefix) \
       --with-aips++ 
diff --git a/Appl/CEP/CS1/CS1_InputSection/Makefile.am b/Appl/CEP/CS1/CS1_InputSection/Makefile.am
index 0289ae7119a084714e0142982190aea0a2a5773b..7f71108fd0104c8b7ae50b39bc8a98b456a811a2 100644
--- a/Appl/CEP/CS1/CS1_InputSection/Makefile.am
+++ b/Appl/CEP/CS1/CS1_InputSection/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/Appl/CEP/CS1/CS1_Interface/Makefile.am b/Appl/CEP/CS1/CS1_Interface/Makefile.am
index 8bb73a1251e54a09e4dea6ef16db3dc8ad6e3ac3..d5081daa9901dac325430f85e245821e49b5e403 100644
--- a/Appl/CEP/CS1/CS1_Interface/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Interface/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix) \
       --with-transport=$(prefix) \
diff --git a/Appl/CEP/CS1/CS1_Run/Makefile.am b/Appl/CEP/CS1/CS1_Run/Makefile.am
index a9f3f15289479d449771edb2369d3b1061e49082..a4873c2d3ed19f4cab51688fb3362e45b1e3c293 100644
--- a/Appl/CEP/CS1/CS1_Run/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Run/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/Appl/CEP/CS1/CS1_Storage/Makefile.am b/Appl/CEP/CS1/CS1_Storage/Makefile.am
index 8b3aaa5143a093b98653a2f1ecbd19a89917ed48..70dde203d034160704a2b0ca3dd2a9b091d33f5f 100644
--- a/Appl/CEP/CS1/CS1_Storage/Makefile.am
+++ b/Appl/CEP/CS1/CS1_Storage/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/CEP/BB/BBS3/Makefile.am b/CEP/BB/BBS3/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..59df0d4e4ac1fd64131dfd9b26f3e29b98b5fd08 100644
--- a/CEP/BB/BBS3/Makefile.am
+++ b/CEP/BB/BBS3/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src test
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/BB/BBSControl/Makefile.am b/CEP/BB/BBSControl/Makefile.am
index 364c8980189de18e37406dd3cd477141bf22ec28..a241d90ae084b1bb4aec3229f424255dfec05b51 100644
--- a/CEP/BB/BBSControl/Makefile.am
+++ b/CEP/BB/BBSControl/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = include src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS = \
       --with-common=$(prefix) \
       --with-blob=$(prefix) \
diff --git a/CEP/BB/BBSKernel/Makefile.am b/CEP/BB/BBSKernel/Makefile.am
index a594bed4fd2fdd9763f7cf302b9e04260a91bfa4..7aad684e198a63f196f15d5ee5d5e17d6fbdd3ec 100644
--- a/CEP/BB/BBSKernel/Makefile.am
+++ b/CEP/BB/BBSKernel/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-parmdb=$(prefix) \
 	--with-ms=$(prefix)
diff --git a/CEP/BB/BDBReplication/Makefile.am b/CEP/BB/BDBReplication/Makefile.am
index acbfee038bc3d83766573dda5ffabf22aab8b1bf..b7cd6f048ab4af5f0544195e47b42dfd081ef54d 100644
--- a/CEP/BB/BDBReplication/Makefile.am
+++ b/CEP/BB/BDBReplication/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/BB/MS/Makefile.am b/CEP/BB/MS/Makefile.am
index acbfee038bc3d83766573dda5ffabf22aab8b1bf..b7cd6f048ab4af5f0544195e47b42dfd081ef54d 100644
--- a/CEP/BB/MS/Makefile.am
+++ b/CEP/BB/MS/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/BB/ParmDB/Makefile.am b/CEP/BB/ParmDB/Makefile.am
index fffc9a936facef0687b6bf2b26a7e89ba7f20538..9baf97a94caafadee69494f3c812ded0859b5f75 100644
--- a/CEP/BB/ParmDB/Makefile.am
+++ b/CEP/BB/ParmDB/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/CEP/BB/ParmFacade/Makefile.am b/CEP/BB/ParmFacade/Makefile.am
index 86dd5c384e171e78981c81b5ce2196d95686c7e2..0afea52c1b5a7b1601e4b8932761ffe9311df6dc 100644
--- a/CEP/BB/ParmFacade/Makefile.am
+++ b/CEP/BB/ParmFacade/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/CEP/CEPFrame/Makefile.am b/CEP/CEPFrame/Makefile.am
index 2354df8c522831e3244784fb41ae575154620092..e64492393f3a98316417bfbec7532849cc59c9ba 100644
--- a/CEP/CEPFrame/Makefile.am
+++ b/CEP/CEPFrame/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
         --with-common=$(prefix) \
         --with-transport=$(prefix) \
diff --git a/CEP/Demo/EmptyAppl/Makefile.am b/CEP/Demo/EmptyAppl/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Demo/EmptyAppl/Makefile.am
+++ b/CEP/Demo/EmptyAppl/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Demo/ExampleSim/Makefile.am b/CEP/Demo/ExampleSim/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Demo/ExampleSim/Makefile.am
+++ b/CEP/Demo/ExampleSim/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Demo/OnLineProto/Makefile.am b/CEP/Demo/OnLineProto/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Demo/OnLineProto/Makefile.am
+++ b/CEP/Demo/OnLineProto/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/AccepTest1/Makefile.am b/CEP/Tools/AccepTest1/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Tools/AccepTest1/Makefile.am
+++ b/CEP/Tools/AccepTest1/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/AccepTest2/Makefile.am b/CEP/Tools/AccepTest2/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Tools/AccepTest2/Makefile.am
+++ b/CEP/Tools/AccepTest2/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/Generator/Makefile.am b/CEP/Tools/Generator/Makefile.am
index 7d1da98c85d89fdfe9a7965f49220fc6f7aa639c..474d7aff18a0d807ed873e33fa75de5bf30bf523 100644
--- a/CEP/Tools/Generator/Makefile.am
+++ b/CEP/Tools/Generator/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/CEP/Tools/PerfTest/3BlockPerf/Makefile.am b/CEP/Tools/PerfTest/3BlockPerf/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Tools/PerfTest/3BlockPerf/Makefile.am
+++ b/CEP/Tools/PerfTest/3BlockPerf/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/PerfTest/AsyncTest/Makefile.am b/CEP/Tools/PerfTest/AsyncTest/Makefile.am
index acbfee038bc3d83766573dda5ffabf22aab8b1bf..b7cd6f048ab4af5f0544195e47b42dfd081ef54d 100644
--- a/CEP/Tools/PerfTest/AsyncTest/Makefile.am
+++ b/CEP/Tools/PerfTest/AsyncTest/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/PerfTest/InOutTest/Makefile.am b/CEP/Tools/PerfTest/InOutTest/Makefile.am
index acbfee038bc3d83766573dda5ffabf22aab8b1bf..b7cd6f048ab4af5f0544195e47b42dfd081ef54d 100644
--- a/CEP/Tools/PerfTest/InOutTest/Makefile.am
+++ b/CEP/Tools/PerfTest/InOutTest/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/PerfTest/P2Perf/Makefile.am b/CEP/Tools/PerfTest/P2Perf/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Tools/PerfTest/P2Perf/Makefile.am
+++ b/CEP/Tools/PerfTest/P2Perf/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Tools/SocketTester/Makefile.am b/CEP/Tools/SocketTester/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/CEP/Tools/SocketTester/Makefile.am
+++ b/CEP/Tools/SocketTester/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/tinyCEP/Makefile.am b/CEP/tinyCEP/Makefile.am
index 33fc7d1316eefbbde9f48387552e08b7a9c47119..e8c14a62905418a7f651c7b6e1341686b82f3855 100644
--- a/CEP/tinyCEP/Makefile.am
+++ b/CEP/tinyCEP/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix) \
 	--with-transport=$(prefix) \
diff --git a/Demo/CEP/StationCorrelator/Makefile.am b/Demo/CEP/StationCorrelator/Makefile.am
index e12e737fd00d2daa36f23e145c2118401d7d16ab..5253f5e063a51f98e934d474fe7f8c3abfe93cd7 100644
--- a/Demo/CEP/StationCorrelator/Makefile.am
+++ b/Demo/CEP/StationCorrelator/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..59df0d4e4ac1fd64131dfd9b26f3e29b98b5fd08 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src test
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_DelayCompensation/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_DelayCompensation/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..59df0d4e4ac1fd64131dfd9b26f3e29b98b5fd08 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_DelayCompensation/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_DelayCompensation/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src test
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Generator/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_Generator/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..59df0d4e4ac1fd64131dfd9b26f3e29b98b5fd08 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Generator/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_Generator/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src test
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_InputSection/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..59df0d4e4ac1fd64131dfd9b26f3e29b98b5fd08 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src test
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Interface/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_Interface/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..6fb8fe442dd9fa4bf3b9f122ef338d6543bd4d71 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Interface/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_Interface/Makefile.am
@@ -1,5 +1,12 @@
 SUBDIRS=src test
 
-DOC_SUBDIRS=src test
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
+DISTCHECK_CONFIGURE_FLAGS=\
+      --with-common=$(prefix) \
+      --with-transport=$(prefix) \
+      --with-aps=$(prefix) \
+      --with-tinycep=$(prefix)
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Interface/test/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_Interface/test/Makefile.am
index df08ad9cfcbc252890656d85724784728be3ec1d..57e7c2842dd1107bb3e0619f392b9c359b8cde43 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Interface/test/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_Interface/test/Makefile.am
@@ -14,5 +14,6 @@ tRectMatrix.sh
 LDADD = ../src/libtfc_interface.la
 DEPENDENCIES = ../src/libtfc_interface.la $(LOFAR_DEPEND)
 
+EXTRA_DIST = $(TESTS)
 
 include $(top_srcdir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Storage/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_Storage/Makefile.am
index 66a0f81cfd5d9fc00925c714c59b5916263d902b..59df0d4e4ac1fd64131dfd9b26f3e29b98b5fd08 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Storage/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_Storage/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DOC_SUBDIRS=src test
 
 include $(top_srcdir)/Makefile.common
diff --git a/JAVA/CEP/jParmFacade/Makefile.am b/JAVA/CEP/jParmFacade/Makefile.am
index ddcc51980501a1c173cbc6e4019f6736324bb2e1..e153695211fa9bda5189b2ed215f0b9c2f4cc493 100644
--- a/JAVA/CEP/jParmFacade/Makefile.am
+++ b/JAVA/CEP/jParmFacade/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/JAVA/MAC/jRSP/Makefile.am b/JAVA/MAC/jRSP/Makefile.am
index 71e03e3503f65c094e5d11f31b34678ef126477a..9e426fe5b1de409ffa64e983919d7495667478af 100644
--- a/JAVA/MAC/jRSP/Makefile.am
+++ b/JAVA/MAC/jRSP/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/LCS/ACC/ACCbin/Makefile.am b/LCS/ACC/ACCbin/Makefile.am
index 88c1d7d2723837f0c24c1e81170851b01b179b3b..08d0d4f66d7aea6c7063cdc562433b59f0748acc 100644
--- a/LCS/ACC/ACCbin/Makefile.am
+++ b/LCS/ACC/ACCbin/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix) \
       --with-transport=$(prefix) \
diff --git a/LCS/ACC/ALC/Makefile.am b/LCS/ACC/ALC/Makefile.am
index 620333339a1ba1b01bf4729da0dcceb2136c0d83..d90b7ed488a16e43af8b6cd8425cf09adb196361 100644
--- a/LCS/ACC/ALC/Makefile.am
+++ b/LCS/ACC/ALC/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix) \
       --with-blob=$(prefix) \
diff --git a/LCS/ACC/APS/Makefile.am b/LCS/ACC/APS/Makefile.am
index ad94eda24cc676244666a6603f52960e5dc3523a..5184d6fa64c13ce43223716668430d05c21caa13 100644
--- a/LCS/ACC/APS/Makefile.am
+++ b/LCS/ACC/APS/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/LCS/ACC/PLC/Makefile.am b/LCS/ACC/PLC/Makefile.am
index d44d654898dffa5d104d518aaa6fd06d109ce7bd..91342596c916de40292d6699c3537cf069bceed5 100644
--- a/LCS/ACC/PLC/Makefile.am
+++ b/LCS/ACC/PLC/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix) \
       --with-blob=$(prefix) \
diff --git a/LCS/AMC/AMCBase/Makefile.am b/LCS/AMC/AMCBase/Makefile.am
index 2da1fbf8c29e158fad4954d5930dd142a0393e92..6ac1406661435b690a6b6c622fdb1f5c21ad9fcf 100644
--- a/LCS/AMC/AMCBase/Makefile.am
+++ b/LCS/AMC/AMCBase/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = include src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-common=$(prefix) \
 	--with-blob=$(prefix) \
diff --git a/LCS/AMC/AMCImpl/Makefile.am b/LCS/AMC/AMCImpl/Makefile.am
index 6cad29533a6bb4cdb9aa5655e0245f9183cd80f0..c4ce59fee381822496523d852c5574324e257d8f 100644
--- a/LCS/AMC/AMCImpl/Makefile.am
+++ b/LCS/AMC/AMCImpl/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = include src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-common=$(prefix) \
 	--with-transport=$(prefix) \
diff --git a/LCS/Blob/Makefile.am b/LCS/Blob/Makefile.am
index 5935d1ac7033fb89e8c74d3e052092b0f81e3dfa..d3a149d8442150ce01d7a8c7ab0dd0f2ea8d6a22 100644
--- a/LCS/Blob/Makefile.am
+++ b/LCS/Blob/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/LCS/Common/Makefile.am b/LCS/Common/Makefile.am
index 67e477501d6d16338d8ec4980cda932400d0a42d..d59691a9d99c0a14c7d4478df275f2d350b06f1d 100644
--- a/LCS/Common/Makefile.am
+++ b/LCS/Common/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=include src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       Common.spec \
diff --git a/LCS/Math/Makefile.am b/LCS/Math/Makefile.am
index 58e44aa9e378012e63c5c970fe93d350426293f3..19a2aaab1523b58d9013aa0be98fff7f81064416 100644
--- a/LCS/Math/Makefile.am
+++ b/LCS/Math/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/LCS/Tools/Makefile.am b/LCS/Tools/Makefile.am
index 04059712d29255bda6eed9e20e0cdbd73f728200..b79d020ce8df77aa20557887a61dbab52aad4925 100644
--- a/LCS/Tools/Makefile.am
+++ b/LCS/Tools/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       Tools.spec \
diff --git a/LCS/Transport/Makefile.am b/LCS/Transport/Makefile.am
index 0182730dc1e5e6d4a8c883d93b4134c15953504a..5ccbfaa1a82208da035fe58809f8ef1daa741b6d 100644
--- a/LCS/Transport/Makefile.am
+++ b/LCS/Transport/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix) \
       --with-blob=$(prefix)
diff --git a/LCS/databases/PL/Makefile.am b/LCS/databases/PL/Makefile.am
index 7a60579056272f1943f97b8247d05abcd4fb9aa1..dc24126c37901d88301648668e7782c76c6115e8 100644
--- a/LCS/databases/PL/Makefile.am
+++ b/LCS/databases/PL/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = include scripts src demo test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-common=$(prefix) 
 
diff --git a/LCS/databases/TransportPL/Makefile.am b/LCS/databases/TransportPL/Makefile.am
index 161f7455d022a4bf60641cbe45447f4764e96d94..62f6d0fe2bd5d6f6231628726eea700f4af48f58 100644
--- a/LCS/databases/TransportPL/Makefile.am
+++ b/LCS/databases/TransportPL/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/LCS/databases/TransportPostgres/Makefile.am b/LCS/databases/TransportPostgres/Makefile.am
index 2df37b568b9a1d1874184c7848fbb7927727359b..53e36c2940129ad88c4d137a320e3cc60b4cfcf8 100644
--- a/LCS/databases/TransportPostgres/Makefile.am
+++ b/LCS/databases/TransportPostgres/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/APLCommon/Makefile.am b/MAC/APL/APLCommon/Makefile.am
index 484b14403c4f9e464613046cfdb81d19c34d89d9..006854a780f785657460edf7abccaa9d29975bcd 100644
--- a/MAC/APL/APLCommon/Makefile.am
+++ b/MAC/APL/APLCommon/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/CEPCU/Makefile.am b/MAC/APL/CEPCU/Makefile.am
index b9ed03a9b1c5866fe498ce79e54517b5f3226e8a..d2bd40f9c3ff9200e624cd37e2c007c52a37b943 100644
--- a/MAC/APL/CEPCU/Makefile.am
+++ b/MAC/APL/CEPCU/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       CEPCU.spec \
diff --git a/MAC/APL/CUDaemons/Makefile.am b/MAC/APL/CUDaemons/Makefile.am
index ef50a44917dc0d6426bb127a575ad01fb65ade81..a0cde8334f475b979ae3640b607b6f9aa511311a 100644
--- a/MAC/APL/CUDaemons/Makefile.am
+++ b/MAC/APL/CUDaemons/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       CUDaemons.spec \
diff --git a/MAC/APL/MainCU/Makefile.am b/MAC/APL/MainCU/Makefile.am
index 9f9e52186c123680696a9e7f09a855b56c91f680..0b65f32b2fd9c366766f2afe21f4c2bbc4ec61bb 100644
--- a/MAC/APL/MainCU/Makefile.am
+++ b/MAC/APL/MainCU/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       MainCU.spec \
diff --git a/MAC/APL/PAC/BS_Protocol/Makefile.am b/MAC/APL/PAC/BS_Protocol/Makefile.am
index 3d043deae37d762c00f8ae889a7d2f032e4fa3f8..b1c69bc5720f3abf4675fd23a6d5cc5fa2bcb474 100644
--- a/MAC/APL/PAC/BS_Protocol/Makefile.am
+++ b/MAC/APL/PAC/BS_Protocol/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix) \
 	--with-gcfcommon=$(prefix) \
diff --git a/MAC/APL/PAC/BeamServer/Makefile.am b/MAC/APL/PAC/BeamServer/Makefile.am
index e691e9296effddfe948142863a9aef42f1284eb5..6d0a046ae93dd7df7c6e1c6c6122db3fb3916ab9 100644
--- a/MAC/APL/PAC/BeamServer/Makefile.am
+++ b/MAC/APL/PAC/BeamServer/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS = src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix)\
 	--with-suite=$(prefix)\
diff --git a/MAC/APL/PAC/CAL_Protocol/Makefile.am b/MAC/APL/PAC/CAL_Protocol/Makefile.am
index f3a4b33a358d4a80d09e8b198cfa379821683b59..4775c7ab1ea6fb472f4c9c2005f97ed60d390100 100644
--- a/MAC/APL/PAC/CAL_Protocol/Makefile.am
+++ b/MAC/APL/PAC/CAL_Protocol/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix) \
 	--with-gcfcommon=$(prefix) \
diff --git a/MAC/APL/PAC/CalServer/Makefile.am b/MAC/APL/PAC/CalServer/Makefile.am
index c4f9e4c4b331967553b69ce1f94c795604fc78a8..8415329905215f1e0a763db9fd4e5040f1f8d8d6 100644
--- a/MAC/APL/PAC/CalServer/Makefile.am
+++ b/MAC/APL/PAC/CalServer/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS = src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PAC/_StationOperations/Makefile.am b/MAC/APL/PAC/_StationOperations/Makefile.am
index 4eb1505b7ae90e87a86dd96ebf7bc0db0bf42f64..420d5c7692e294741012cee3a245f475791801d2 100644
--- a/MAC/APL/PAC/_StationOperations/Makefile.am
+++ b/MAC/APL/PAC/_StationOperations/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PAC/_StationReceptorGroup/Makefile.am b/MAC/APL/PAC/_StationReceptorGroup/Makefile.am
index f7c929a3f2ee388d337f05bbcef909f492441aeb..e27d8319368179e64a8037210a4bb4e6c159b036 100644
--- a/MAC/APL/PAC/_StationReceptorGroup/Makefile.am
+++ b/MAC/APL/PAC/_StationReceptorGroup/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PAC/_StationStartDaemon/Makefile.am b/MAC/APL/PAC/_StationStartDaemon/Makefile.am
index 73a7ba28494c6b7795b1d1cc263dba8ec9bee905..73cf5821d5cb01f8b48919de648b6f6a8ca86196 100644
--- a/MAC/APL/PAC/_StationStartDaemon/Makefile.am
+++ b/MAC/APL/PAC/_StationStartDaemon/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PAC/_VirtualBackend/Makefile.am b/MAC/APL/PAC/_VirtualBackend/Makefile.am
index 278a53653274a9d3f01afae69733ec93c096abc5..428a0b9f4498a91fd5cca21791ec258929c353f8 100644
--- a/MAC/APL/PAC/_VirtualBackend/Makefile.am
+++ b/MAC/APL/PAC/_VirtualBackend/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/APL/PAC/_VirtualTelescope/Makefile.am b/MAC/APL/PAC/_VirtualTelescope/Makefile.am
index 17f77c5ed3e84704da9b375c52eecd0a7919aa06..a0aa9a6e9b6cbe44e4544ccb5bec92db2b135d53 100644
--- a/MAC/APL/PAC/_VirtualTelescope/Makefile.am
+++ b/MAC/APL/PAC/_VirtualTelescope/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PIC/ETHTest/Makefile.am b/MAC/APL/PIC/ETHTest/Makefile.am
index d0a75b0b921fd80b76f4676e339d6bfb4593245c..6a05e9701dd13fd07a07f295be585c895046d9a8 100644
--- a/MAC/APL/PIC/ETHTest/Makefile.am
+++ b/MAC/APL/PIC/ETHTest/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/MIS/Makefile.am b/MAC/APL/PIC/MIS/Makefile.am
index 30206571988ec144469d9754eb56bfb0277849a8..fb901a5da39024e081ac9b0bc7061d5850cf1657 100644
--- a/MAC/APL/PIC/MIS/Makefile.am
+++ b/MAC/APL/PIC/MIS/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/APL/PIC/RSPCtlFE/Makefile.am b/MAC/APL/PIC/RSPCtlFE/Makefile.am
index 19d1f5f3e539915e2a2ab2d3efa4b35ce6d33d7f..b75bd0ac37e209c65685820bc8c6d3d73c7bcadd 100755
--- a/MAC/APL/PIC/RSPCtlFE/Makefile.am
+++ b/MAC/APL/PIC/RSPCtlFE/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PIC/RSPDriver/Makefile.am b/MAC/APL/PIC/RSPDriver/Makefile.am
index 67be7be88a7d03819295fb48f6b0cbb65a5b9888..8ba57be76666e0e0a1da1879778aed872fbcc3c9 100644
--- a/MAC/APL/PIC/RSPDriver/Makefile.am
+++ b/MAC/APL/PIC/RSPDriver/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS = src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       RSPDriver.spec \
diff --git a/MAC/APL/PIC/RSP_Protocol/Makefile.am b/MAC/APL/PIC/RSP_Protocol/Makefile.am
index 050987fa168444fc8bb0dda6ef2cf67269da4bb1..192ae537d5094cd88eab06506adcfb3a794c2984 100644
--- a/MAC/APL/PIC/RSP_Protocol/Makefile.am
+++ b/MAC/APL/PIC/RSP_Protocol/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS	= src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix) \
 	--with-gcfcommon=$(prefix) \
diff --git a/MAC/APL/PIC/TBBDriver/Makefile.am b/MAC/APL/PIC/TBBDriver/Makefile.am
index 0ec9f5cfc9458ec6c3d3a25133b80e14eb6f826b..b09f8718f91e6425ba850adf8f5c1bf1349fe116 100644
--- a/MAC/APL/PIC/TBBDriver/Makefile.am
+++ b/MAC/APL/PIC/TBBDriver/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/PIC/TBB_Protocol/Makefile.am b/MAC/APL/PIC/TBB_Protocol/Makefile.am
index 4d1598507fd3623d0751ac9578880e81f0a7c5f2..ec233a4b3062e5bf7971516135cb63df9823cdbc 100644
--- a/MAC/APL/PIC/TBB_Protocol/Makefile.am
+++ b/MAC/APL/PIC/TBB_Protocol/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS	= src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix) \
 	--with-gcfcommon=$(prefix) \
diff --git a/MAC/APL/PIC/_NodeManager/Makefile.am b/MAC/APL/PIC/_NodeManager/Makefile.am
index 607e80198f37ffde694412d4f8a22c7cf5d71aed..303ba56934004dd7bdcb1e0d46803874df798091 100644
--- a/MAC/APL/PIC/_NodeManager/Makefile.am
+++ b/MAC/APL/PIC/_NodeManager/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/APL/PIC/_RegisterAccess/Makefile.am b/MAC/APL/PIC/_RegisterAccess/Makefile.am
index 73696b3cb1482c4be5a15f7aabd95a13375ca3b6..e4434799ca24ed8e1dcb8a423f5145798b8391ef 100644
--- a/MAC/APL/PIC/_RegisterAccess/Makefile.am
+++ b/MAC/APL/PIC/_RegisterAccess/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/RTCCommon/Makefile.am b/MAC/APL/RTCCommon/Makefile.am
index 5c4ad6c42e9d996c0b5417c950e80bfada1392de..73a83db4ea7792bde90072f80237ed5c1379a232 100644
--- a/MAC/APL/RTCCommon/Makefile.am
+++ b/MAC/APL/RTCCommon/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
 	--with-common=$(prefix) \
 	--with-suite=$(prefix)\
diff --git a/MAC/APL/StationCU/Makefile.am b/MAC/APL/StationCU/Makefile.am
index 026ac4ef1b757d4f8a6889630ff22b867acb42dc..7ef4e2947c30898b3c17e3000ac8de1b5d1a08fc 100644
--- a/MAC/APL/StationCU/Makefile.am
+++ b/MAC/APL/StationCU/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       StationCU.spec \
diff --git a/MAC/APL/StsMisc/Makefile.am b/MAC/APL/StsMisc/Makefile.am
index fd49fdf64df3bd65fa39acc75412aa410dd27344..743463f445b7950c37c0054306fdb92ce18af02c 100644
--- a/MAC/APL/StsMisc/Makefile.am
+++ b/MAC/APL/StsMisc/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src 
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/TestCtlr/Makefile.am b/MAC/APL/TestCtlr/Makefile.am
index 9f9e52186c123680696a9e7f09a855b56c91f680..0b65f32b2fd9c366766f2afe21f4c2bbc4ec61bb 100644
--- a/MAC/APL/TestCtlr/Makefile.am
+++ b/MAC/APL/TestCtlr/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       MainCU.spec \
diff --git a/MAC/APL/_GSO/MACScheduler/Makefile.am b/MAC/APL/_GSO/MACScheduler/Makefile.am
index 9574c6ff92455fcaae5274595b53aa8cb4a3fae1..563b6d4bd65024f7c538fce9c44ac1ddf9f38c33 100644
--- a/MAC/APL/_GSO/MACScheduler/Makefile.am
+++ b/MAC/APL/_GSO/MACScheduler/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/_VIC/ArrayOperations/Makefile.am b/MAC/APL/_VIC/ArrayOperations/Makefile.am
index 802337bb87ce25e251502094bec3b8899fcd6882..86862cc22e1fc4750a7c34d8a80b6244c8a0fe16 100644
--- a/MAC/APL/_VIC/ArrayOperations/Makefile.am
+++ b/MAC/APL/_VIC/ArrayOperations/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/_VIC/ArrayReceptorGroup/Makefile.am b/MAC/APL/_VIC/ArrayReceptorGroup/Makefile.am
index 819be34aab17d1282b6c0c4745bd0f8c0dfce6af..8f3b7c1889dca0f1f03578c82b3b7ec073371ff8 100644
--- a/MAC/APL/_VIC/ArrayReceptorGroup/Makefile.am
+++ b/MAC/APL/_VIC/ArrayReceptorGroup/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/_VIC/VirtualInstrument/Makefile.am b/MAC/APL/_VIC/VirtualInstrument/Makefile.am
index 137673f3733079c8316ad645df7babc3b67bd228..416e6d028a3a2745e744168e414bb404034a07e6 100644
--- a/MAC/APL/_VIC/VirtualInstrument/Makefile.am
+++ b/MAC/APL/_VIC/VirtualInstrument/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/APL/_VIC/VirtualRoute/Makefile.am b/MAC/APL/_VIC/VirtualRoute/Makefile.am
index 679375c960ca123856d64272763855e81090da31..500c086d49d54657abde4ecfe562db14188ebb5a 100644
--- a/MAC/APL/_VIC/VirtualRoute/Makefile.am
+++ b/MAC/APL/_VIC/VirtualRoute/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/Deployment/Makefile.am b/MAC/Deployment/Makefile.am
index 33c9f88419aa8d830b6a4f6d8ac33c9151ef7a4f..ff1e29a7979df4f6fd80d300c3f32eafdc2168a0 100644
--- a/MAC/Deployment/Makefile.am
+++ b/MAC/Deployment/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=data
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 EXTRA_DIST = \
       Makefile.common \
       Deployment.spec \
diff --git a/MAC/Drivers/spid/Makefile.am b/MAC/Drivers/spid/Makefile.am
index 05acbd05b6f8e808f66f66cb8aadcca954d8d785..d1beff547354d1993e01532ae5a168db43b546a2 100755
--- a/MAC/Drivers/spid/Makefile.am
+++ b/MAC/Drivers/spid/Makefile.am
@@ -2,6 +2,9 @@ EXTRA_DIST = \
 	mac-spid.spec
 
 SUBDIRS = \
+
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
 	src \
 	aclocal \
 	tools
diff --git a/MAC/GCF/GCFCommon/Makefile.am b/MAC/GCF/GCFCommon/Makefile.am
index 67828ab394e034db521fdfdc1dbb3d78380a048c..4f351897eddcfab518bd3952ab84a83befbd79a5 100644
--- a/MAC/GCF/GCFCommon/Makefile.am
+++ b/MAC/GCF/GCFCommon/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include pvss
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/GCF/LogSys/Makefile.am b/MAC/GCF/LogSys/Makefile.am
index b9f0d4abda696f1d1ad2aebda6a38f91b1170a47..ede9a80e924f48e8c2184397704225199c8a343f 100644
--- a/MAC/GCF/LogSys/Makefile.am
+++ b/MAC/GCF/LogSys/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=KVLogSys CLP include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/GCF/Protocols/Makefile.am b/MAC/GCF/Protocols/Makefile.am
index ccdefe3d589d7c8edb8efa916c9eb59abc929ec8..283f7bfe0eb6705683c52cc6f1c1408d6a504b64 100644
--- a/MAC/GCF/Protocols/Makefile.am
+++ b/MAC/GCF/Protocols/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/GCF/TM/Makefile.am b/MAC/GCF/TM/Makefile.am
index e6343b04643c0ed990c06fd4deb2c03ddc73b4f9..ea24f76b4ddf0f25285c0ba56aff679ff398ec36 100644
--- a/MAC/GCF/TM/Makefile.am
+++ b/MAC/GCF/TM/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=autogen src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/GCF/_PAL/Makefile.am b/MAC/GCF/_PAL/Makefile.am
index 9bb943c02b0b17a7098172e158e9b7ce1227ae05..c97181f181c5a8b0198d4e0b4f493c2d14a66166 100644
--- a/MAC/GCF/_PAL/Makefile.am
+++ b/MAC/GCF/_PAL/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=SAL PA PML PI include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/GCF/_PALlight/Makefile.am b/MAC/GCF/_PALlight/Makefile.am
index 30de278225cc06f17f01c6ecb634396b95389fd0..fe373393111783a22f48319340175713d298fffb 100644
--- a/MAC/GCF/_PALlight/Makefile.am
+++ b/MAC/GCF/_PALlight/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=PMLlight CEP-PMLlight include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 #DISTCHECK_CONFIGURE_FLAGS=\
 #      --with-common=$(prefix) # "common" is an example
 
diff --git a/MAC/Test/GCF/CEP/Makefile.am b/MAC/Test/GCF/CEP/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/GCF/CEP/Makefile.am
+++ b/MAC/Test/GCF/CEP/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/MAC/Makefile.am b/MAC/Test/GCF/MAC/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/GCF/MAC/Makefile.am
+++ b/MAC/Test/GCF/MAC/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/GCF/RTC/Makefile.am b/MAC/Test/GCF/RTC/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/GCF/RTC/Makefile.am
+++ b/MAC/Test/GCF/RTC/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/GPI/Makefile.am b/MAC/Test/PROTO/GPI/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/PROTO/GPI/Makefile.am
+++ b/MAC/Test/PROTO/GPI/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/PI/Makefile.am b/MAC/Test/PROTO/PI/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/PROTO/PI/Makefile.am
+++ b/MAC/Test/PROTO/PI/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/PROP/Makefile.am b/MAC/Test/PROTO/PROP/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/PROTO/PROP/Makefile.am
+++ b/MAC/Test/PROTO/PROP/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/PVSSAPI/Makefile.am b/MAC/Test/PROTO/PVSSAPI/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/PROTO/PVSSAPI/Makefile.am
+++ b/MAC/Test/PROTO/PVSSAPI/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/PROTO/TASK/Makefile.am b/MAC/Test/PROTO/TASK/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/PROTO/TASK/Makefile.am
+++ b/MAC/Test/PROTO/TASK/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/Suite/Makefile.am b/MAC/Test/Suite/Makefile.am
index c725ce5067e59c8b76c9956ac4d1879e678bfac1..039e7e6cf2d5dfc5f882c96265d3da75bfe05ab0 100644
--- a/MAC/Test/Suite/Makefile.am
+++ b/MAC/Test/Suite/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/MAC/Test/TestHarness/THEcho/Makefile.am b/MAC/Test/TestHarness/THEcho/Makefile.am
index 161f7455d022a4bf60641cbe45447f4764e96d94..62f6d0fe2bd5d6f6231628726eea700f4af48f58 100644
--- a/MAC/Test/TestHarness/THEcho/Makefile.am
+++ b/MAC/Test/TestHarness/THEcho/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src test
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/THPVSSBridge/Makefile.am b/MAC/Test/TestHarness/THPVSSBridge/Makefile.am
index a014c15b3e0cc91454edade91ee05c7b57830868..e9e92adbea54bc1cabb0a0dace1a3a4a72d43ac0 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/Makefile.am
+++ b/MAC/Test/TestHarness/THPVSSBridge/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=src
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/Test/TestHarness/TSE/Makefile.am b/MAC/Test/TestHarness/TSE/Makefile.am
index 07ea6d0720684b59d5df26f274d5e8d009e31da8..ae0a24797329cd0756827930867baf7dbdf9bce9 100644
--- a/MAC/Test/TestHarness/TSE/Makefile.am
+++ b/MAC/Test/TestHarness/TSE/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src 
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
      --with-common=$(prefix)
      
diff --git a/SAS/OTB/jOTDB2/Makefile.am b/SAS/OTB/jOTDB2/Makefile.am
index 12a3d63bab5326136a9297e42ad940f971e5ce1b..91623644721e7bccf93042f38cabc9d67245ac92 100644
--- a/SAS/OTB/jOTDB2/Makefile.am
+++ b/SAS/OTB/jOTDB2/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix)
 
diff --git a/SAS/OTDB/Makefile.am b/SAS/OTDB/Makefile.am
index bafea6feb990528c2313c3c5eb43b3d3aeeea6fb..7dd90a8f8f71c77d14921aba5ff497241c39868f 100644
--- a/SAS/OTDB/Makefile.am
+++ b/SAS/OTDB/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS=src test bin include
 
+pkgextdir     = $(prefix)/config/$(PACKAGE)
+pkgext_DATA   = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
+
 DISTCHECK_CONFIGURE_FLAGS=\
       --with-common=$(prefix) \
       --with-aps=$(prefix)