Index: trunk/ippconfig/Makefile.am
===================================================================
--- trunk/ippconfig/Makefile.am	(revision 11573)
+++ trunk/ippconfig/Makefile.am	(revision 11576)
@@ -1,132 +1,31 @@
-config_files = \
-	./ipprc.config \
-	./gpc1/camera.config \
-	./gpc1/format_raw.config \
-	./ctio_mosaic2/camera.config \
-	./ctio_mosaic2/format.config \
-	./ctio_mosaic2/ppImage.config \
-	./ctio_mosaic2/psphot.config \
-	./ctio_mosaic2_chip/camera.config \
-	./ctio_mosaic2_chip/format.config \
-	./ctio_mosaic2_chip/psphot.config \
-	./ipprc.config \
-	./megacam_alternate/camera.config \
-	./megacam_alternate/format.config \
-	./megacam_alternate/phase2.config \
-	./megacam_alternate/psphot.config \
-	./isp/cmp.config \
-	./isp/phase2.config \
-	./isp/ppMerge.config \
-	./isp/psastro.config \
-	./isp/camera.config \
-	./isp/format.config \
-	./isp/ppImage.config \
-	./isp/ppStats.config \
-	./isp/psphot.config \
-	./ucam/camera.config \
-	./ucam/format_raw.config \
-	./ucam/ppImage.config \
-	./ucam/ppImage_b.config \
-	./ucam/ppImage_d.config \
-	./ucam/ppImage_f.config \
-	./ucam/ppImage_j.config \
-	./ucam/ppImage_o.config \
-	./ucam/ppImage_ob.config \
-	./ucam/ppImage_obd.config \
-	./ucam/ppImage_obdf.config \
-	./ucam/ppMerge_bias.config \
-	./ucam/ppMerge_dark.config \
-	./ucam/ppMerge_flat.config \
-	./ucam/ppStats.config \
-	./ucam/psastro.config \
-	./ucam/psphot.config \
-	./recipes/ppImage.config \
-	./recipes/ppMerge.config \
-	./recipes/ppStats.config \
-	./recipes/ppStats_phase0.config \
-	./recipes/psastro.config \
-	./recipes/psphot.config \
-	./recipes/ppStac.config \
-	./megacam_chipmosaic/camera.config \
-	./megacam_chipmosaic/format_mosaic.config \
-	./megacam_fpamosaic/camera.config \
-	./megacam_fpamosaic/format_mosaic.config \
-	./mcshort_chip/camera.config \
-	./mcshort_chip/format_mosaic.config \
-	./ctio_mosaic2_fpa/camera.config \
-	./ctio_mosaic2_fpa/format.config \
-	./mcshort_fpa/camera.config \
-	./mcshort_fpa/format_mosaic.config \
-	./ucam_mosaic/camera.config \
-	./ucam_mosaic/format_mosaic.config \
-	./ucam_mosaic/ppImage.config \
-	./ucam_mosaic/ppImage_b.config \
-	./ucam_mosaic/ppImage_d.config \
-	./ucam_mosaic/ppImage_f.config \
-	./ucam_mosaic/ppImage_j.config \
-	./ucam_mosaic/ppImage_o.config \
-	./ucam_mosaic/ppImage_ob.config \
-	./ucam_mosaic/ppImage_obd.config \
-	./ucam_mosaic/ppImage_obdf.config \
-	./ucam_mosaic/ppMerge_bias.config \
-	./ucam_mosaic/ppMerge_dark.config \
-	./ucam_mosaic/ppMerge_flat.config \
-	./ucam_mosaic/ppStats.config \
-	./ucam_mosaic/psastro.config \
-	./ucam_mosaic/psphot.config \
-	./lris_blue/camera.config \
-	./lris_blue/format_raw.config \
-	./lris_blue/format_mef.config \
-	./lris_red/camera.config \
-	./lris_red/format_raw.config \
-	./lris_red/format_spec.config \
-	./mcshort/camera.config \
-	./mcshort/format_raw.config \
-	./mcshort/format_spliced.config \
-	./mcshort/format_split.config \
-	./megacam/camera.config \
-	./megacam/format_raw.config \
-	./megacam/format_spliced.config \
-	./megacam/format_split.config \
-	./megacam/format_split_mask.config \
-	./megacam/ppImage.config \
-	./megacam/psphot.config \
-	./megacam/format_spliced_mask.config \
-	./megacam/psastro.config \
-	./megacam/ppStats.config \
-	./megacam/ppMerge_bias.config \
-	./megacam/ppMerge_dark.config \
-	./megacam/ppMerge_flat.config \
-	./megacam/ppMerge_fringe.config \
-	./megacam_detrended/camera.config \
-	./megacam_detrended/format_spliced.config \
-	./megacam_detrended/format_split.config \
-	./megacam_detrended/phase2.config \
-	./megacam_detrended/psphot.config \
-	./megacam_detrended/psastro.config \
-	./simple/camera.config \
-	./simple/format.config \
-	./simple/psphot.config \
-	./simple/phase2.config \
-	./simple/psastro.config \
-	./simple/ppImage.config 
+SUBDIRS = \
+	dvo.cameras \
+	recipes \
+	isp \
+	megacam \
+	simple
 
+install_files = \
+	GSCregions.tbl \
+	dvo.photcodes
 
-ippconfigdir = $(datadir)/ippconfig
-ippconfig_DATA = $(config_files)
+built_sources = \
+	ipprc.config.in \
+	dvo.site.in
 
-dvoconfigdir = $(datadir)/ippconfig
-dvo_files = \
-	dvo.photcodes \
-	dvo.cameras/ISP-Apogee.config
+built_files = \
+	ipprc.config \
+	dvo.site
 
-dvoconfig_DATA = $(dvo_files) dvo.site
+installdir = $(datadir)/ippconfig
+
+install_DATA = $(install_files) $(built_files)
 
 install-data-hook:
-	chmod 0755 $(ippconfigdir) 
+	chmod 0755 $(installdir) 
 
-EXTRA_DIST = $(config_files) $(dvo_files) dvo.site.in
+EXTRA_DIST = $(install_files) $(built_sources)
 
-BUILT_SOURCES = dvo.site
+BUILT_SOURCES = $(built_files)
 
 ACLOCAL_AMFLAGS = -I m4