[postgis-tickets] r16278 - Fix install and clean rules

[Sandro Santilli]

Author: strk
Date: 2018-01-12 11:17:20 -0800 (Fri, 12 Jan 2018)
New Revision: 16278

Modified:
   trunk/extensions/address_standardizer/Makefile.in
   trunk/extensions/postgis_tiger_geocoder/Makefile.in
Log:
Fix install and clean rules

Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in	2018-01-12 16:50:48 UTC (rev 16277)
+++ trunk/extensions/address_standardizer/Makefile.in	2018-01-12 19:17:20 UTC (rev 16278)
@@ -34,7 +34,7 @@
 MINORVERSION  = @POSTGIS_MAJOR_VERSION at .@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 += 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)

Modified: trunk/extensions/postgis_tiger_geocoder/Makefile.in
===================================================================
--- trunk/extensions/postgis_tiger_geocoder/Makefile.in	2018-01-12 16:50:48 UTC (rev 16277)
+++ trunk/extensions/postgis_tiger_geocoder/Makefile.in	2018-01-12 19:17:20 UTC (rev 16278)
@@ -22,10 +22,10 @@
                         $(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 @@
 	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