From 2c05a0cf199486cc377f8d692880cd29c83e8a97 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Wed, 28 Oct 1998 23:54:10 +0100
Subject: [PATCH] Support for auto-generated module.pmod.in added.

Rev: src/modules/dynamic_module_makefile.in:1.45
Rev: src/modules/static_module_makefile.in:1.39
---
 src/modules/dynamic_module_makefile.in | 4 ++--
 src/modules/static_module_makefile.in  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 4033c7795f..fb37bcc9bc 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.44 1998/09/20 08:30:42 hubbe Exp $
+# $Id: dynamic_module_makefile.in,v 1.45 1998/10/28 22:54:08 marcus Exp $
 #
 
 
@@ -27,7 +27,7 @@ dummy:	$(DUMMY) linker_options modlist_headers modlist_segment module.so
 	@tmp="$(INSTALL_NAME)" ; \
 	if test x$$tmp = x ; then tmp="$(MODNAME)"; else :; fi ;\
 	$(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so ;\
-	if [ -f $(SRCDIR)/module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <$(SRCDIR)/module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod ; else :; fi
+	if [ -f $(SRCDIR)/module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <$(SRCDIR)/module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod ; else if [ -f ./module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <./module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod; else :; fi; fi
 
 linker_options: Makefile
 	echo "$(LINKER_OPTIONS)" >linker_options
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index 28c87d9828..82b0c366d5 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.38 1998/10/21 19:54:44 hubbe Exp $
+# $Id: static_module_makefile.in,v 1.39 1998/10/28 22:54:10 marcus Exp $
 #
 
 
@@ -65,7 +65,11 @@ module.pmod: Makefile
 	if [ -f $(SRCDIR)/module.pmod.in ]; then \
 	   sed -e "s/@module@/_static_modules.$(MODNAME)/" <$(SRCDIR)/module.pmod.in >module.pmod ;\
 	else \
-	  echo >module.pmod "inherit _static_modules.$(MODNAME);" ;\
+	  if [ -f ./module.pmod.in ]; then \
+	   sed -e "s/@module@/_static_modules.$(MODNAME)/" <./module.pmod.in >module.pmod ;\
+	  else \
+	    echo >module.pmod "inherit _static_modules.$(MODNAME);" ;\
+	  fi \
 	fi
 
 module.a: $(OBJS)
-- 
GitLab