blob: 088dd465b7a125a77d971654b7f103632066d41a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff -wurN astrometry.net-0.52/Makefile astrometry.net-0.52.fix-paths/Makefile
--- astrometry.net-0.52/Makefile 2015-03-06 21:26:45.000000000 +0100
+++ astrometry.net-0.52.fix-paths/Makefile 2015-03-11 19:30:45.513371808 +0100
@@ -122,18 +122,18 @@
install-core:
mkdir -p '$(DATA_INSTALL_DIR)'
mkdir -p '$(BIN_INSTALL_DIR)'
- mkdir -p '$(INSTALL_DIR)/doc'
+ mkdir -p '$(DOC_INSTALL_DIR)'
mkdir -p '$(INCLUDE_INSTALL_DIR)'
mkdir -p '$(LIB_INSTALL_DIR)'
- mkdir -p '$(INSTALL_DIR)/examples'
+ mkdir -p '$(EXAMPLES_INSTALL_DIR)'
mkdir -p '$(PY_BASE_INSTALL_DIR)'
- mkdir -p '$(INSTALL_DIR)/ups'
- cp ups/astrometry_net.table-dist '$(INSTALL_DIR)/ups/astrometry_net.table'
- cp ups/astrometry_net.cfg '$(INSTALL_DIR)/ups'
+ mkdir -p '$(UPS_INSTALL_DIR)'
+ cp ups/astrometry_net.table-dist '$(UPS_INSTALL_DIR)/astrometry_net.table'
+ cp ups/astrometry_net.cfg '$(UPS_INSTALL_DIR)/'
cp __init__.py '$(PY_BASE_INSTALL_DIR)'
- cp CREDITS LICENSE README.md '$(INSTALL_DIR)/doc'
- cp report.txt '$(INSTALL_DIR)/doc'
- cp demo/* '$(INSTALL_DIR)/examples'
+ cp CREDITS LICENSE README.md '$(DOC_INSTALL_DIR)/'
+ cp report.txt '$(DOC_INSTALL_DIR)/'
+ cp demo/* '$(EXAMPLES_INSTALL_DIR)/'
$(MAKE) -C util install-core
$(MAKE) -C catalogs install
$(MAKE) -C libkd install
diff -wurN astrometry.net-0.52/util/makefile.common astrometry.net-0.52.fix-paths/util/makefile.common
--- astrometry.net-0.52/util/makefile.common 2015-03-06 21:26:45.000000000 +0100
+++ astrometry.net-0.52.fix-paths/util/makefile.common 2015-03-11 19:16:37.893728999 +0100
@@ -22,16 +22,6 @@
# Put INSTALL_DIR in the environment of commands run by Make.
export INSTALL_DIR
-# Installation subdirs
-
-PY_BASE_INSTALL_DIR := $(INSTALL_DIR)/lib/python/astrometry
-INCLUDE_INSTALL_DIR := $(INSTALL_DIR)/include/astrometry
-LIB_INSTALL_DIR := $(INSTALL_DIR)/lib
-BIN_INSTALL_DIR := $(INSTALL_DIR)/bin
-DATA_INSTALL_DIR := $(INSTALL_DIR)/data
-PY_BASE_LINK_DIR := ../lib/python/astrometry
-ETC_INSTALL_DIR ?= $(INSTALL_DIR)/etc
-
# If your build system stages an install in one place (say, a temp
# dir) and then copies everything to the final install place, (eg,
# debian), set *_INSTALL_DIR to the staging place and *_FINAL_DIR to
|
