Fix install and clean rules

git-svn-id: http://svn.osgeo.org/postgis/trunk@16278 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 17e0c7e12e073dbdbe0582f6716ba452338fe739..9b73012f33ae6d8177f0e51100ab07310ae63e9b 100644 (file)
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -34,7 +34,7 @@ EXTVERSION    = @POSTGIS_LIB_VERSION@
 MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULE_big = address_standardizer
 EXTENSION = address_standardizer
-DATA = address_standardizer_data_us.control sql/$(EXTENSION).sql sql/$(EXTENSION)_data_us.sql
+DATA = sql/$(EXTENSION).sql sql/$(EXTENSION)_data_us.sql
 
 DATA_built = \
        $(EXTENSION).control \
@@ -179,7 +179,8 @@ EXTRA_CLEAN += $(wildcard expected/*--*.out)
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql *.a *.so *.dll
 
-EXTRA_CLEAN += Makefile
+distclean: clean
+       rm Makefile
 
 PGXS := @PGXS@
 include $(PGXS)

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 3083a98e29bc04baae63fa6f29b317d100180efc..9c59423cb996f301920bd11007d64b70025230f6 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -22,10 +22,10 @@ PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
                         $(GREP) "[a-zA-Z]" | \
                         $(PERL) -pe 's/(\d+[a-zA-Z]+)\d*/\1/'
 
-DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
-
 DATA_built = \
        $(EXTENSION).control \
+       sql/$(EXTENSION)--$(EXTVERSION).sql \
+       sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql \
        $(NULL)
 
 REGRESS = test-normalize_address test-upgrade
@@ -239,9 +239,7 @@ uninstall-upgrade-paths:
        rm -f $(INSTALLED_UPGRADE_SCRIPTS)
 
 #only extension files
-DATA = ${EXTENSION}.control sql/$(EXTENSION).sql $(wildcard sql/*--*.sql)
 EXTRA_CLEAN += $(wildcard expected/*--*.out)
-EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
 
 distclean: clean
        rm Makefile