first pass at DESTDIR.
This commit is contained in:
fgsch
parent
79098ffb5d
commit
c40a689212
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2002/04/30 18:12:43 fgsch Exp $
|
||||
--- Makefile.in.orig Tue Apr 30 01:49:38 2002
|
||||
+++ Makefile.in Tue Apr 30 01:49:51 2002
|
||||
@@ -1675,7 +1675,7 @@ configure-target-libiberty: $(ALL_GCC_C)
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2002/05/04 10:43:07 fgsch Exp $
|
||||
--- Makefile.in.orig Tue Jun 19 18:03:42 2001
|
||||
+++ Makefile.in Sat May 4 06:18:09 2002
|
||||
@@ -1675,13 +1675,13 @@ configure-target-libiberty: $(ALL_GCC_C)
|
||||
all-target-libiberty: configure-target-libiberty
|
||||
all-target: $(ALL_TARGET_MODULES)
|
||||
install-target: $(INSTALL_TARGET_MODULES)
|
||||
@ -10,3 +10,11 @@ $OpenBSD: patch-Makefile_in,v 1.1 2002/04/30 18:12:43 fgsch Exp $
|
||||
install-sid: install-tcl install-tk
|
||||
### other supporting targets
|
||||
|
||||
MAKEDIRS= \
|
||||
- $(prefix) \
|
||||
- $(exec_prefix)
|
||||
+ $(DESTDIR)$(prefix) \
|
||||
+ $(DESTDIR)$(exec_prefix)
|
||||
.PHONY: installdirs
|
||||
installdirs: mkinstalldirs
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-binutils_Makefile_in,v 1.1 2002/04/30 18:12:43 fgsch Exp $
|
||||
--- binutils/Makefile.in.orig Tue Apr 30 01:48:48 2002
|
||||
+++ binutils/Makefile.in Tue Apr 30 01:48:55 2002
|
||||
$OpenBSD: patch-binutils_Makefile_in,v 1.2 2002/05/04 10:43:07 fgsch Exp $
|
||||
--- binutils/Makefile.in.orig Mon May 28 15:34:46 2001
|
||||
+++ binutils/Makefile.in Sat May 4 06:23:58 2002
|
||||
@@ -837,6 +837,7 @@ maintainer-clean-recursive:
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
@ -9,3 +9,27 @@ $OpenBSD: patch-binutils_Makefile_in,v 1.1 2002/04/30 18:12:43 fgsch Exp $
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
@@ -1244,18 +1245,18 @@ install-exec-local: install-binPROGRAMS
|
||||
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
|
||||
if test -f $$p; then \
|
||||
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
||||
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
else :; fi; \
|
||||
done
|
||||
- $(mkinstalldirs) $(tooldir)/bin
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
|
||||
for i in $(TOOL_PROGS); do \
|
||||
if [ -f $$i$(EXEEXT) ]; then \
|
||||
j=`echo $$i | sed -e 's/-new//'`; \
|
||||
k=`echo $$j | sed '$(transform)'`; \
|
||||
if [ "$(bindir)/$$k$(EXEEXT)" != "$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
|
||||
- rm -f $(tooldir)/bin/$$j$(EXEEXT); \
|
||||
- ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
|
||||
- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \
|
||||
+ rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
|
||||
+ ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
|
||||
+ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
|
||||
fi; \
|
||||
else true; \
|
||||
fi; \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-gas_Makefile_am,v 1.1.1.1 2002/02/19 04:19:21 fgsch Exp $
|
||||
$OpenBSD: patch-gas_Makefile_am,v 1.2 2002/05/04 10:43:07 fgsch Exp $
|
||||
--- gas/Makefile.am.orig Mon Jun 11 07:04:36 2001
|
||||
+++ gas/Makefile.am Wed Jan 2 18:10:36 2002
|
||||
+++ gas/Makefile.am Sat May 4 06:42:05 2002
|
||||
@@ -348,6 +348,7 @@ TARG_ENV_HFILES = \
|
||||
config/te-macos.h \
|
||||
config/te-nbsd.h \
|
||||
@ -9,3 +9,31 @@ $OpenBSD: patch-gas_Makefile_am,v 1.1.1.1 2002/02/19 04:19:21 fgsch Exp $
|
||||
config/te-pc532mach.h \
|
||||
config/te-pe.h \
|
||||
config/te-ppcnw.h \
|
||||
@@ -643,21 +644,21 @@ CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ
|
||||
install-exec-local: install-exec-bindir @install_tooldir@
|
||||
|
||||
install-exec-bindir: $(noinst_PROGRAMS)
|
||||
- $(mkinstalldirs) $(bindir)
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
|
||||
if test -f $$p; then \
|
||||
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
||||
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
else :; fi; \
|
||||
done
|
||||
|
||||
install-exec-tooldir: install-exec-bindir $(noinst_PROGRAMS)
|
||||
- $(mkinstalldirs) $(tooldir)/bin
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
|
||||
n=`echo as | sed '$(transform)'`; \
|
||||
if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \
|
||||
- rm -f $(tooldir)/bin/as$(EXEEXT); \
|
||||
- ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
|
||||
- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(tooldir)/bin/as$(EXEEXT); \
|
||||
+ rm -f $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
|
||||
+ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
|
||||
+ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
|
||||
else \
|
||||
true ; \
|
||||
fi
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-ld_Makefile_am,v 1.1.1.1 2002/02/19 04:19:21 fgsch Exp $
|
||||
$OpenBSD: patch-ld_Makefile_am,v 1.2 2002/05/04 10:43:07 fgsch Exp $
|
||||
--- ld/Makefile.am.orig Mon Jun 11 07:05:07 2001
|
||||
+++ ld/Makefile.am Wed Feb 13 23:19:24 2002
|
||||
+++ ld/Makefile.am Sat May 4 06:44:48 2002
|
||||
@@ -168,6 +168,7 @@ ALL_EMULATIONS = \
|
||||
ehp3hpux.o \
|
||||
ehppaelf.o \
|
||||
@ -74,3 +74,35 @@ $OpenBSD: patch-ld_Makefile_am,v 1.1.1.1 2002/02/19 04:19:21 fgsch Exp $
|
||||
est2000.c: $(srcdir)/emulparams/st2000.sh \
|
||||
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/st2000.sc ${GEN_DEPENDS}
|
||||
${GENSCRIPTS} st2000 "$(tdir_st2000)"
|
||||
@@ -911,24 +928,24 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
|
||||
.PHONY: install-exec-local install-data-local
|
||||
|
||||
install-exec-local: ld-new$(EXEEXT)
|
||||
- $(mkinstalldirs) $(bindir) $(tooldir)/bin
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin
|
||||
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
|
||||
if test -f $$p; then \
|
||||
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
|
||||
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
else :; fi; \
|
||||
done
|
||||
n=`echo ld | sed '$(transform)'`; \
|
||||
if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \
|
||||
- rm -f $(tooldir)/bin/ld$(EXEEXT); \
|
||||
- ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
|
||||
- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(tooldir)/bin/ld$(EXEEXT); \
|
||||
+ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
|
||||
+ ln $(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
|
||||
+ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
|
||||
fi
|
||||
|
||||
install-data-local:
|
||||
- $(mkinstalldirs) $(scriptdir)/ldscripts
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
|
||||
for f in ldscripts/*; do \
|
||||
- $(INSTALL_DATA) $$f $(scriptdir)/$$f ; \
|
||||
+ $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
|
||||
done
|
||||
|
||||
# Stuff that should be included in a distribution. The diststuff
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user