openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-09 10:48:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix installation when install-sh is not executable.

Browse Source 
the nobase_* variables force the use of install-sh, without '${SHELL}'.
Use a more traditional approach, that uses the normally probed INSTALL
program. Problem noticed by oga@.
This commit is contained in:
matthieu
2010-11-01 14:58:19 +00:00
parent 47220c0c8b
commit 868f443a6c
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libXpm/include/Makefile.am
View File

@@ -1 +1,2 @@
nobase_include_HEADERS = X11/xpm.h
xpmincludedir = ${includedir}/X11
xpminclude_HEADERS = X11/xpm.h

55
lib/libXpm/include/Makefile.in
View File

@@ -37,8 +37,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = include
DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(xpminclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
@@ -55,9 +55,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(includedir)"
nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
HEADERS = $(nobase_include_HEADERS)
am__installdirs = "$(DESTDIR)$(xpmincludedir)"
xpmincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(xpminclude_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -196,7 +196,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
nobase_include_HEADERS = X11/xpm.h
xpmincludedir = ${includedir}/X11
xpminclude_HEADERS = X11/xpm.h
all: all-am
.SUFFIXES:
@@ -239,24 +240,22 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-nobase_includeHEADERS: $(nobase_include_HEADERS)
install-xpmincludeHEADERS: $(xpminclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
@$(am__vpath_adj_setup) \
list='$(nobase_include_HEADERS)'; for p in $$list; do \
test -z "$(xpmincludedir)" || $(mkdir_p) "$(DESTDIR)$(xpmincludedir)"
@list='$(xpminclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__vpath_adj) \
echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
$(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
f=$(am__strip_dir) \
echo " $(xpmincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xpmincludedir)/$$f'"; \
$(xpmincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xpmincludedir)/$$f"; \
done
uninstall-nobase_includeHEADERS:
uninstall-xpmincludeHEADERS:
@$(NORMAL_UNINSTALL)
@$(am__vpath_adj_setup) \
list='$(nobase_include_HEADERS)'; for p in $$list; do \
$(am__vpath_adj) \
echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
rm -f "$(DESTDIR)$(includedir)/$$f"; \
@list='$(xpminclude_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(xpmincludedir)/$$f'"; \
rm -f "$(DESTDIR)$(xpmincludedir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -339,7 +338,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(includedir)"; do \
for dir in "$(DESTDIR)$(xpmincludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -385,7 +384,7 @@ info: info-am
info-am:
install-data-am: install-nobase_includeHEADERS
install-data-am: install-xpmincludeHEADERS
install-exec-am:
@@ -411,19 +410,19 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS
uninstall-am: uninstall-info-am uninstall-xpmincludeHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool ctags distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-nobase_includeHEADERS \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
uninstall-nobase_includeHEADERS
install-info-am install-man install-strip \
install-xpmincludeHEADERS installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags uninstall uninstall-am uninstall-info-am \
uninstall-xpmincludeHEADERS
# 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.