hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected a problem of not honoring DESTDIR in Makefile.am

Browse Source
This commit is contained in:
hyung-hwan
2009-01-21 08:07:39 +00:00
parent 2220eda162
commit 7b902d626f
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qse/Makefile.am
View File

@ -3,7 +3,7 @@ AUTOMAKE_OPTION = foreign
# EXTRA_DIST = # EXTRA_DIST =
SUBDIRS = lib cmd SUBDIRS = lib cmd
DIST_SUBDIRS = $(__COREDIRS) include test DIST_SUBDIRS = $(SUBDIRS) include test
install-data-hook: install-data-hook:
cd include && $(MAKE) install cd include && $(MAKE) install

2
qse/Makefile.in
View File

@ -193,7 +193,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTION = foreign AUTOMAKE_OPTION = foreign
# EXTRA_DIST = # EXTRA_DIST =
SUBDIRS = lib cmd SUBDIRS = lib cmd
DIST_SUBDIRS = $(__COREDIRS) include test DIST_SUBDIRS = $(SUBDIRS) include test
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:

8
qse/include/qse/Makefile.am
View File

@ -9,9 +9,9 @@ pkgincludedir= $(includedir)/qse
CLEANFILES = *dist CLEANFILES = *dist
install-data-hook: install-data-hook:
@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h" @"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"
@"$(RM)" -f "$(pkgincludedir)/config.h.in" @"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h.in"
@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h" @"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(DESTDIR)$(pkgincludedir)/types.h"
uninstall-hook: uninstall-hook:
@"$(RM)" -f "$(pkgincludedir)/config.h" @"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h"

8
qse/include/qse/Makefile.in
View File

@ -551,12 +551,12 @@ uninstall-am: uninstall-pkgincludeHEADERS
install-data-hook: install-data-hook:
@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h" @"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"
@"$(RM)" -f "$(pkgincludedir)/config.h.in" @"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h.in"
@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h" @"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(DESTDIR)$(pkgincludedir)/types.h"
uninstall-hook: 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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT: