From 06fa582130dac08e8c51ba27e2226f7ec7fc29ae Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 19 Aug 1998 12:56:20 +0000 Subject: Patches from Ralf Corsepius and myself to make solaris target buildable. > 1. The ipc check fails since solaris does not define union semun. > The unix port code actually defines this type itself on solaris. Doing > the same thing lets it get configured. Then... > 2. It looks like BSDINSTALL is not defined properly. BSDINSTALL is defined in make/host.cfg.in as BSDINSTALL=@INSTALL@ @INSTALL@ is generated by autoconf's standard macro AC_PROG_INSTALL, which is widely used in almost any autoconf/automake configured package. In case there is really something wrong with it, then it must be considered a bug in autoconf. I can see a doubious fragment in AC_PROG_INSTALL, which is used when no appropriate bsd-install is found. Finally Ralf saw a problem with the find on solaris which I also saw and fixed. --- c/src/exec/score/tools/generic/Makefile.in | 4 ++-- c/src/exec/score/tools/sh/Makefile.in | 4 ++-- c/src/make/host.cfg.in | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'c/src') diff --git a/c/src/exec/score/tools/generic/Makefile.in b/c/src/exec/score/tools/generic/Makefile.in index e5fdec7d7f..4586a43b45 100644 --- a/c/src/exec/score/tools/generic/Makefile.in +++ b/c/src/exec/score/tools/generic/Makefile.in @@ -24,10 +24,10 @@ INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) # Install the program $(DESTDIR)/%: % - $(BSDINSTALL) $(INSTBINFLAGS) $^ $@ + @INSTALL@ $(INSTBINFLAGS) $^ $@ diff --git a/c/src/exec/score/tools/sh/Makefile.in b/c/src/exec/score/tools/sh/Makefile.in index c35743adea..cbda87fbd8 100644 --- a/c/src/exec/score/tools/sh/Makefile.in +++ b/c/src/exec/score/tools/sh/Makefile.in @@ -55,8 +55,8 @@ ${PGMS}: $(OBJS) $(LINK_FILES) $(make-exe) $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ # Install the program install: $(DESTDIR) $(PGMS) - $(BSDINSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR) + @INSTALL@ $(INSTBINFLAGS) ${PGMS} $(DESTDIR) diff --git a/c/src/make/host.cfg.in b/c/src/make/host.cfg.in index a68a1b2faf..0c8f9cf408 100644 --- a/c/src/make/host.cfg.in +++ b/c/src/make/host.cfg.in @@ -30,7 +30,6 @@ CHMOD=@CHMOD@ SED=@SED@ M4=@M4@ -BSDINSTALL=@INSTALL@ INSTALL=$(PROJECT_TOOLS)/install-if-change INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)" -- cgit v1.2.3