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 2b1b9a4e06e0bc6a6fa45665c26e76ba28dc9c1d..148e87150003905c49f76c9884424b8b157b7929 100644 (file)
--- 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) >> $@\r
        @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@\r
        @echo $(DL)any further documentation:$(DL) >> $@\r
-       @echo $(DL)http://www.rrdtool.org/$(DL) >> $@\r
+       @echo $(DL)$(WWWURL)$(DL) >> $@\r
 \r
 \r

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