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
51
52
53
54
55
|
From: Ole Streicher <olebole@debian.org>
Date: Fri, 8 Jul 2016 09:28:16 +0200
Subject: Use the system provided sextractor binary instead of the convenience
copy
---
acinclude.m4 | 2 +-
configure.ac | 2 +-
external/Makefile.am | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 54e0d1f..384360e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -172,7 +172,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
# Define the preprocessor symbols for the sextractor executable
# and the configuration files.
- eval sext_bindir="${prefix}/lib/${PACKAGE}-${VERSION}/bin"
+ eval sext_bindir="/usr/bin"
AC_DEFINE_UNQUOTED(VIMOS_SEXTRACTOR_PATH, "$sext_bindir",
[Absolute path to the sextractor executable])
diff --git a/configure.ac b/configure.ac
index 90a7c59..49876da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ VIMOS_SET_SEX_PREFIX
VIMOS_SET_PSFEX_PREFIX
-AC_CONFIG_SUBDIRS(external/sextractor external/psfex)
+AC_CONFIG_SUBDIRS(external/psfex)
AC_CONFIG_FILES(Makefile
Makefile.purify
diff --git a/external/Makefile.am b/external/Makefile.am
index a6853b3..f112b5f 100644
--- a/external/Makefile.am
+++ b/external/Makefile.am
@@ -24,10 +24,10 @@ DISTCLEANFILES = *~
COMPILE_FIRST =
-TOPSUBDIRS = libwcs sextractor
+TOPSUBDIRS = libwcs
-COMPILE_LAST = $(PSFEXDIR)
+COMPILE_LAST =
SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
-DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) psfex
+DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS)
|
