aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2008-01-24 15:05:56 +0000
committerGunter Knauf <gk@gknw.de>2008-01-24 15:05:56 +0000
commit2d38d0d515df621561124021d8af88e8ebe90c6a (patch)
tree1d843bbf77e139178be93b71d466b6037139c08e
parente796c79d18a7f23e14703a192a5bfcb8c712ed78 (diff)
minor makefile tweaks.
-rw-r--r--lib/Makefile.netware6
-rw-r--r--src/Makefile.netware6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 9d266727b..d6230200f 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -72,7 +72,7 @@ else
CC = gcc
endif
# a native win32 awk can be downloaded from here:
-# http://www.gknw.net/development/prgtools/awk-20050424.zip
+# http://www.gknw.net/development/prgtools/awk-20070501.zip
AWK = awk
YACC = bison -y
CP = cp -afv
@@ -336,9 +336,9 @@ endif
ifdef IMPORTS
@echo $(DL)import $(IMPORTS)$(DL) >> $@
endif
-ifeq ($(LD),nlmconv)
- @echo $(DL)input $(OBJL)$(DL) >> $@
+ifeq ($(findstring nlmconv,$(LD)),nlmconv)
@echo $(DL)input $(PRELUDE)$(DL) >> $@
+ @echo $(DL)input $(OBJL)$(DL) >> $@
#ifdef LDLIBS
# @echo $(DL)input $(LDLIBS)$(DL) >> $@
#endif
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 6b4159af5..e74c111c2 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -73,7 +73,7 @@ else
CC = gcc
endif
# a native win32 awk can be downloaded from here:
-# http://www.gknw.net/development/prgtools/awk-20050424.zip
+# http://www.gknw.net/development/prgtools/awk-20070501.zip
AWK = awk
CP = cp -afv
# RM = rm -f
@@ -324,9 +324,9 @@ endif
ifdef IMPORTS
@echo $(DL)import $(IMPORTS)$(DL) >> $@
endif
-ifeq ($(LD),nlmconv)
- @echo $(DL)input $(OBJS)$(DL) >> $@
+ifeq ($(findstring nlmconv,$(LD)),nlmconv)
@echo $(DL)input $(PRELUDE)$(DL) >> $@
+ @echo $(DL)input $(OBJS)$(DL) >> $@
ifdef LDLIBS
@echo $(DL)input $(LDLIBS)$(DL) >> $@
endif