corrected a problem of not honoring DESTDIR in Makefile.am
This commit is contained in:
parent
2220eda162
commit
7b902d626f
@ -3,7 +3,7 @@ AUTOMAKE_OPTION = foreign
|
||||
# EXTRA_DIST =
|
||||
|
||||
SUBDIRS = lib cmd
|
||||
DIST_SUBDIRS = $(__COREDIRS) include test
|
||||
DIST_SUBDIRS = $(SUBDIRS) include test
|
||||
|
||||
install-data-hook:
|
||||
cd include && $(MAKE) install
|
||||
|
@ -193,7 +193,7 @@ top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTION = foreign
|
||||
# EXTRA_DIST =
|
||||
SUBDIRS = lib cmd
|
||||
DIST_SUBDIRS = $(__COREDIRS) include test
|
||||
DIST_SUBDIRS = $(SUBDIRS) include test
|
||||
all: all-recursive
|
||||
|
||||
.SUFFIXES:
|
||||
|
@ -9,9 +9,9 @@ pkgincludedir= $(includedir)/qse
|
||||
CLEANFILES = *dist
|
||||
|
||||
install-data-hook:
|
||||
@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(pkgincludedir)/config.h.in"
|
||||
@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h"
|
||||
@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h.in"
|
||||
@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(DESTDIR)$(pkgincludedir)/types.h"
|
||||
|
||||
uninstall-hook:
|
||||
@"$(RM)" -f "$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h"
|
||||
|
@ -551,12 +551,12 @@ uninstall-am: uninstall-pkgincludeHEADERS
|
||||
|
||||
|
||||
install-data-hook:
|
||||
@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(pkgincludedir)/config.h.in"
|
||||
@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h"
|
||||
@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h.in"
|
||||
@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(DESTDIR)$(pkgincludedir)/types.h"
|
||||
|
||||
uninstall-hook:
|
||||
@"$(RM)" -f "$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h"
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
@ -5,5 +5,5 @@ if ENABLE_CXX
|
||||
pkginclude_HEADERS += Awk.hpp StdAwk.hpp
|
||||
endif
|
||||
|
||||
pkgincludedir= $(includedir)/qse/awk
|
||||
pkgincludedir = $(includedir)/qse/awk
|
||||
CLEANFILES = *dist
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
pkginclude_HEADERS = mem.h chr.h str.h lda.h map.h rex.h sll.h dll.h opt.h fio.h pcp.h tio.h sio.h time.h
|
||||
|
||||
pkgincludedir= $(includedir)/qse/cmn
|
||||
pkgincludedir = $(includedir)/qse/cmn
|
||||
|
||||
CLEANFILES = *dist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user