From d5d10e6b9cecb1031651543df65e99ae00f75de9 Mon Sep 17 00:00:00 2001 From: oetiker Date: Sun, 21 May 2006 22:07:02 +0000 Subject: [PATCH] another Makefile update from guenter git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@835 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/src/Makefile.NetWare | 2 +- program/src/Makefile.Win32 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/program/src/Makefile.NetWare b/program/src/Makefile.NetWare index 2b1b9a4e..148e8715 100644 --- a/program/src/Makefile.NetWare +++ b/program/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/program/src/Makefile.Win32 b/program/src/Makefile.Win32 index c37aa00b..d454f7a4 100644 --- a/program/src/Makefile.Win32 +++ b/program/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) >> $@ -- 2.30.2