From ef70827836f3b53000731a0c087e98f32ca5a1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Mon, 20 Mar 2000 12:56:11 -0800 Subject: [PATCH] make should now work properly in module subdirs Rev: src/modules/dynamic_module_makefile.in:1.65 Rev: src/modules/module_configure.in:1.7 Rev: src/modules/static_module_makefile.in:1.56 --- src/modules/dynamic_module_makefile.in | 3 ++- src/modules/module_configure.in | 3 ++- src/modules/static_module_makefile.in | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in index cb0848dd3e..f6cf2cec75 100644 --- a/src/modules/dynamic_module_makefile.in +++ b/src/modules/dynamic_module_makefile.in @@ -1,5 +1,5 @@ # -# $Id: dynamic_module_makefile.in,v 1.64 2000/03/10 20:02:40 hubbe Exp $ +# $Id: dynamic_module_makefile.in,v 1.65 2000/03/20 20:56:11 hubbe Exp $ # @@ -22,6 +22,7 @@ NOOPT_CFLAGS=$(PREFLAGS) $(NOOPTFLAGS) @CCSHARED@ $(MODULE_CFLAGS) MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC) @CCSHARED@" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" "AR=$(AR)" "NOOPTFLAGS=$(NOOPTFLAGS)" $(MODULE_MAKE_FLAGS) +MODNAME=`pwd|sed -e 's@.*/@@g'` all: dummy diff --git a/src/modules/module_configure.in b/src/modules/module_configure.in index 16245fc3da..f82cfa6f14 100644 --- a/src/modules/module_configure.in +++ b/src/modules/module_configure.in @@ -1,4 +1,4 @@ -# $Id: module_configure.in,v 1.6 1999/04/23 20:15:08 grubba Exp $ +# $Id: module_configure.in,v 1.7 2000/03/20 20:56:11 hubbe Exp $ AC_PROG_CC AC_DEFINE(POSIX_SOURCE) @@ -8,6 +8,7 @@ AC_SUBST(CONFIG_HEADERS) AC_SUBST_FILE(dependencies) dependencies=$srcdir/dependencies + AC_SUBST_FILE(dynamic_module_makefile) if test -f ../dynamic_module_makefile; then dynamic_module_makefile=../dynamic_module_makefile diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in index a75acc3ac1..1cbdc4d144 100644 --- a/src/modules/static_module_makefile.in +++ b/src/modules/static_module_makefile.in @@ -1,5 +1,5 @@ # -# $Id: static_module_makefile.in,v 1.55 2000/03/09 05:06:08 mast Exp $ +# $Id: static_module_makefile.in,v 1.56 2000/03/20 20:56:11 hubbe Exp $ # @@ -20,6 +20,8 @@ NOOPT_CFLAGS=$(PREFLAGS) $(NOOPTFLAGS) @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)" "AR=$(AR)" "NOOPTFLAGS=$(NOOPTFLAGS)" $(MODULE_MAKE_FLAGS) +MODNAME=`pwd|sed -e 's@.*/@@g'` + all: dummy force: -- GitLab