From ba4a38b4f9c5a0b0acd01c652bdcda5bdb0cfabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Wed, 7 May 1997 16:03:47 -0700 Subject: [PATCH] minor bugfix Rev: src/modules/dynamic_module_makefile.in:1.14 Rev: src/modules/static_module_makefile.in:1.13 --- src/modules/dynamic_module_makefile.in | 4 ++-- src/modules/static_module_makefile.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in index 4662963965..815d250e5d 100644 --- a/src/modules/dynamic_module_makefile.in +++ b/src/modules/dynamic_module_makefile.in @@ -3,12 +3,12 @@ CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @CCSHARED@ $(MODULE_CFLAGS) MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" $(MODULE_MAKE_FLAGS) -all: subdirs dummy module.@SO@ +all: subdirs dummy subdirs: for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done -dummy: $(DUMMY) linker_options modlist_headers modlist_segment +dummy: $(DUMMY) linker_options modlist_headers modlist_segment module.so tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so linker_options: Makefile diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in index 759e15f38b..5e3ca644ec 100644 --- a/src/modules/static_module_makefile.in +++ b/src/modules/static_module_makefile.in @@ -3,12 +3,12 @@ CFLAGS=$(PREFLAGS) $(OTHERFLAGS) $(MODULE_CFLAGS) MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" $(MODULE_MAKE_FLAGS) -all: subdirs dummy module.a +all: subdirs dummy subdirs: for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done -dummy: linker_options modlist_headers modlist_segment module.pmod +dummy: linker_options modlist_headers modlist_segment module.pmod module.a tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod linker_options: Makefile $(MODULE_ARCHIVES) @@ -28,7 +28,7 @@ module.a: $(OBJS) -rm -f module.a ar cq module.a $(OBJS) -@RANLIB@ module.a - touch linker_options + if test -f linker_options ; then touch linker_options ; fi clean: -rm -f *.o *.a *.so module.so module.pmod -- GitLab