From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Sun, 21 May 2006 22:07:02 +0000 (+0000)
Subject: another Makefile update from guenter
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ecde2598239f5d8a13b89698a8bdbdd3f92aabf6;p=rrdtool.git

another Makefile update from guenter

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@835 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/Makefile.NetWare b/src/Makefile.NetWare
index 2b1b9a4..148e871 100644
--- a/src/Makefile.NetWare
+++ b/src/Makefile.NetWare
@@ -478,6 +478,6 @@ $(DISTDIR)/readme.txt: Makefile.NetWare
 	@echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
 	@echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
 	@echo $(DL)any further documentation:$(DL) >> $@
-	@echo $(DL)http://www.rrdtool.org/$(DL) >> $@
+	@echo $(DL)$(WWWURL)$(DL) >> $@
 
 
diff --git a/src/Makefile.Win32 b/src/Makefile.Win32
index c37aa00..d454f7a 100644
--- a/src/Makefile.Win32
+++ b/src/Makefile.Win32
@@ -301,7 +301,9 @@ $(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo     BLOCK "040904E4" >> $@
 	@echo     BEGIN >> $@
 	@echo       VALUE "LegalCopyright","$(COPYR)\0" >> $@
-#	@echo       VALUE "CompanyName","$(COMPANY)\0" >> $@
+ifdef COMPANY
+	@echo       VALUE "CompanyName","$(COMPANY)\0" >> $@
+endif
 	@echo       VALUE "ProductName","$(notdir $(@:.rc=.exe))\0" >> $@
 	@echo       VALUE "ProductVersion","$(RRD_VERSION_STR)\0" >> $@
 	@echo       VALUE "License","Released under GPL.\0" >> $@
@@ -309,9 +311,7 @@ $(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo       VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@
 	@echo       VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@
 	@echo       VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@
-ifdef WWWURL
 	@echo       VALUE "WWW","$(WWWURL)\0" >> $@
-endif
 	@echo     END >> $@
 	@echo   END >> $@
 	@echo   BLOCK "VarFileInfo" >> $@
@@ -393,6 +393,6 @@ $(DISTDIR)/readme.txt: Makefile.Win32
 	@echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
 	@echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
 	@echo $(DL)any further documentation:$(DL) >> $@
-	@echo $(DL)http://www.rrdtool.org/$(DL) >> $@
+	@echo $(DL)$(WWWURL)$(DL) >> $@