diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makeconf | 17 | ||||
| -rw-r--r-- | config/ChangeLog | 15 | ||||
| -rw-r--r-- | config/Makefile | 21 | ||||
| -rw-r--r-- | sutils/ChangeLog | 5 | ||||
| -rw-r--r-- | sutils/Makefile | 4 |
6 files changed, 39 insertions, 28 deletions
@@ -1,3 +1,8 @@ +Thu Sep 19 16:53:09 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makeconf (install) [all variants]: Depend on installation + directory directly; don't make installed file depend on it. + Thu Sep 12 15:45:34 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile (include $(addsuffix .d,$(subdirs))): New directive to @@ -138,15 +138,14 @@ BUGADDR_REF = -uargp_program_bug_address # Installation ifeq ($(doinst),one) all: $(target) -install: $(installationdir)/$(target) -$(installationdir)/$(target): $(target) $(installationdir) +install: $(installationdir) $(installationdir)/$(target) +$(installationdir)/$(target): $(target) $(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@ endif ifeq ($(doinst),many) all: $(targets) -install: $(addprefix $(installationdir)/,$(targets)) -$(addprefix $(installationdir)/,$(targets)): $(installationdir) +install: $(installationdir) $(addprefix $(installationdir)/,$(targets)) $(addprefix $(installationdir)/,$(targets)): $(installationdir)/%: % $(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@ endif @@ -155,9 +154,9 @@ ifeq ($(makemode),library) all: libs install libs: add-to-librecord add-to-librecord: $(targets) -install: $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) +install: $(libdir) $(includedir)/$(installhdrsubdir) $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) -install-headers: $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) +install-headers: $(includedir)/$(installhdrsubdir) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) $(includedir)/$(installhdrsubdir): $(includedir) $(MKINSTALLDIRS) $@ @@ -176,14 +175,12 @@ $(INSTALLED_LOCAL_HEADERS): $(top_srcdir)/$(installhdrsubdir)/%: endif libs: $(INSTALLED_LOCAL_HEADERS) -$(libdir)/$(libname).a: $(libname).a $(libdir) +$(libdir)/$(libname).a: $(libname).a $(INSTALL_DATA) $(libname).a $(libdir)/$(libname).a $(RANLIB) $(libdir)/$(libname).a -$(libdir)/$(libname).so: $(libname).so $(libdir) +$(libdir)/$(libname).so: $(libname).so $(INSTALL_DATA) $(libname).so $(libdir)/$(libname).so -$(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includedir)/$(installhdrsubdir) - $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includedir)/$(installhdrsubdir)/%: % $(INSTALL_DATA) $< $@ diff --git a/config/ChangeLog b/config/ChangeLog index ce3ab90a..ddce8693 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,18 @@ +Thu Sep 19 16:56:52 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (install): Depend on installation directories directly; + don't make installed files depend on the directory. + +Tue Sep 17 16:29:40 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile ($(installed_logins), $(installed_rootdots), + $(installed_conf): Depend on FORCE instead of /dev/null. + (foo): Deleted target. + (LINKEDCONFFILES, installed_links): Deleted vars. + ($(sysconfdir)/rc): Deleted target. + ($(installed_links)): Deleted target. + (install): Don't depend on $(installed_links). + Tue Sep 10 13:53:31 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile ($(installed_conf)): Depend on $(sysconfdir). diff --git a/config/Makefile b/config/Makefile index 536521db..af5c5abe 100644 --- a/config/Makefile +++ b/config/Makefile @@ -35,31 +35,22 @@ installed_logins = $(addprefix $(sysconfdir)/login/,$(LOGINDOTS)) ROOTDOTS = .bash_login .bashrc .profile installed_rootdots = $(addprefix $(prefix)/root/,$(ROOTDOTS)) -# Mere symlinks are installed for these -LINKEDCONFFILES = rc -installed_links = $(addprefix $(sysconfdir)/,$(LINKEDCONFFILES)) - DIST_FILES=$(SYSCONFFILES) \ $(addprefix login-,$(LOGINDOTS)) \ $(addprefix root-,$(ROOTDOTS)) -foo=$(shell touch /dev/null) +FORCE: ifeq ($(override_conf),t) -$(installed_rootdots): /dev/null -$(installed_conf): /dev/null +$(installed_rootdots): FORCE +$(installed_conf): FORCE endif -$(installed_logins): /dev/null +$(installed_logins): FORCE include ../Makeconf -install: $(installed_conf) $(installed_links) $(installed_logins) \ - $(installed_rootdots) - -$(installed_rootdots): $(prefix)/root -$(installed_logins): $(sysconfdir)/login -$(installed_links) $(installed_conf): $(sysconfdir) +install: $(prefix)/root $(sysconfdir) $(sysconfdir/login $(installed_conf) $(installed_logins) $(installed_rootdots) $(prefix)/root $(sysconfdir)/login: %: mkdir -p $@ @@ -73,5 +64,3 @@ $(installed_logins): $(sysconfdir)/login/%: login-% $(installed_conf): $(sysconfdir)/%: % $(INSTALL_DATA) $< $(sysconfdir)/$* -$(sysconfdir)/rc: - ln -s ../libexec/rc $(sysconfdir)/rc diff --git a/sutils/ChangeLog b/sutils/ChangeLog index 45fd0280..ec55b55c 100644 --- a/sutils/ChangeLog +++ b/sutils/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 19 16:58:18 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (install): Depend on installation directory directly; + don't make installed files depend on it. + Tue Sep 17 12:36:09 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile ($(prefix)/dev/MAKEDEV): Depend on $(prefix)/dev. diff --git a/sutils/Makefile b/sutils/Makefile index d2164a3d..3f9d2bd5 100644 --- a/sutils/Makefile +++ b/sutils/Makefile @@ -34,14 +34,14 @@ OBJS = $(filter-out $(SCRIPTS),$(SRCS:.c=.o)) include ../Makeconf all: MAKEDEV -install: $(prefix)/dev/MAKEDEV +install: $(prefix)/dev $(prefix)/dev/MAKEDEV fsck: fstab.o clookup.o reboot halt fsck: ../libshouldbeinlibc/libshouldbeinlibc.a $(filter-out $(special-targets), $(targets)): %: %.o -$(prefix)/dev/MAKEDEV: MAKEDEV $(prefix)/dev +$(prefix)/dev/MAKEDEV: MAKEDEV $(INSTALL_PROGRAM) MAKEDEV $(prefix)/dev/MAKEDEV %: %.sh $(top_srcdir)/sh-version.sed |