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