Blame astrometry-0.73-Don-t-install-non-free-files-images-and-NGC2000.0-catalog.patch

81cd19f
diff -Naur astrometry/catalogs/Makefile astrometry.new/catalogs/Makefile
81cd19f
--- astrometry/catalogs/Makefile	2017-11-18 00:03:49.624856663 +0100
81cd19f
+++ astrometry.new/catalogs/Makefile	2017-11-18 00:04:11.932208704 +0100
81cd19f
@@ -22,11 +22,11 @@
23dea7f
 
23dea7f
 ngc2000.o: ngc2000.c ngc2000names.c ngc2000entries.c
23dea7f
 
23dea7f
-ngc2000names.c: parse-ngc2000names.awk $(DATA)/ngc2000names.dat
23dea7f
-	$(AWK) -f parse-ngc2000names.awk < $(DATA)/ngc2000names.dat  > $@
23dea7f
+ngc2000names.c: parse-ngc2000names.awk
23dea7f
+	$(AWK) -f parse-ngc2000names.awk < /dev/null  > $@
23dea7f
 
23dea7f
-ngc2000entries.py: parse-ngc2000-py.awk $(DATA)/ngc2000.dat
23dea7f
-	$(AWK) -f parse-ngc2000-py.awk < $(DATA)/ngc2000.dat  > $@
23dea7f
+ngc2000entries.py: parse-ngc2000-py.awk
23dea7f
+	$(AWK) -f parse-ngc2000-py.awk < /dev/null  > $@
23dea7f
 
23dea7f
 ngc2000accurate.py: parse-ngcic-accurate-py.awk $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt
23dea7f
 	cat $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt | $(AWK) -f parse-ngcic-accurate-py.awk > $@
81cd19f
@@ -34,8 +34,8 @@
23dea7f
 ngc2000.py: ngc2000-pre.py ngc2000entries.py ngc2000-mid.py ngc2000accurate.py ngc2000-post.py
23dea7f
 	cat $^ > $@
23dea7f
 
23dea7f
-ngc2000entries.c: parse-ngc2000.awk $(DATA)/ngc2000.dat
23dea7f
-	$(AWK) -f parse-ngc2000.awk < $(DATA)/ngc2000.dat  > $@
23dea7f
+ngc2000entries.c: parse-ngc2000.awk
23dea7f
+	$(AWK) -f parse-ngc2000.awk < /dev/null  > $@
23dea7f
 
23dea7f
 ngcic-accurate-entries.c: parse-ngcic-accurate.awk $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt
23dea7f
 	cat $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt | $(AWK) -f parse-ngcic-accurate.awk > $@
81cd19f
@@ -60,8 +60,6 @@
23dea7f
 
23dea7f
 HEADERS_PATH := $(addprefix $(INCLUDE_DIR)/,$(HEADERS))
23dea7f
 
23dea7f
-PYTHON_INSTALL := __init__.py ngc2000.py 
23dea7f
-
23dea7f
 PY_INSTALL_DIR := $(PY_BASE_INSTALL_DIR)/catalogs
23dea7f
 LINK_DIR := $(PY_BASE_LINK_DIR)/catalogs
23dea7f
 
81cd19f
diff -Naur astrometry/Makefile astrometry.new/Makefile
81cd19f
--- astrometry/Makefile	2017-11-18 00:03:49.631856774 +0100
81cd19f
+++ astrometry.new/Makefile	2017-11-18 00:04:26.394436938 +0100
81cd19f
@@ -130,7 +130,6 @@
81cd19f
 	$(MKDIR) '$(MAN1_INSTALL_DIR)'
81cd19f
 	$(CP) __init__.py '$(PY_BASE_INSTALL_DIR)'
81cd19f
 	$(CP) CREDITS LICENSE README.md report.txt '$(DOC_INSTALL_DIR)'
81cd19f
-	$(CP) demo/* '$(EXAMPLE_INSTALL_DIR)'
81cd19f
 	$(CP) man/*.1 '$(MAN1_INSTALL_DIR)'
81cd19f
 	$(MAKE) -C util  install-core
81cd19f
 	$(MAKE) -C catalogs install
81cd19f
@@ -301,8 +300,6 @@
81cd19f
 	$(MAKE) -C catalogs clean
81cd19f
 	-$(MAKE) -C qfits-an clean
81cd19f
 	-rm __init__.pyc
81cd19f
-	$(MAKE) -C gsl-an clean
81cd19f
-	-rm gsl-an/config.h
81cd19f
 	$(MAKE) -C libkd clean
81cd19f
 	$(MAKE) -C blind clean
81cd19f
 	$(MAKE) -C sdss clean