Renaming ntmake.pl to ntmake.PL (r1742) had unforseen side effects. At least

on freebsd ntmake.PL gets called automatically during build. This is not
desired. I renamed the file to ntmake-build sinc it gets called
explicilty on windows anyway. Reported by Kevin modified by Tobi

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3@1757 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/WIN32-BUILD-TIPS.txt b/program/WIN32-BUILD-TIPS.txt
index 67d2dd9b2041e9d32eefbe72afa14e4ed8a4da94..b3fae966ffb3095e6146b89b6764358f978a72fd 100644 (file)
--- a/program/WIN32-BUILD-TIPS.txt
+++ b/program/WIN32-BUILD-TIPS.txt
@@ -151,7 +151,7 @@ and cd to the bindings\perl-shared subdirectory.
 (8) Run vcvars32.bat; this batch file, in your vc98\bin directory will
 set necessary environment options for command line compiling.
 (9) In bindings\perl-shared, run
-perl ntmake.pl
+perl ntmake-build
 nmake
 nmake test
 If nmake test succeeds, you are good to go. RRDs.dll is in 

diff --git a/program/bindings/Makefile.am b/program/bindings/Makefile.am
index 450629ff10a1c912d001771c6dcf824419accdbc..d975032c0d4628d6d83feb39f12b0dfeb01747e7 100644 (file)
--- a/program/bindings/Makefile.am
+++ b/program/bindings/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = $(SUB_tcl)
 
 # the following files are not mentioned in any other Makefile
 EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
-            perl-shared/ntmake.PL perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm  perl-shared/RRDs.xs perl-shared/t/base.t \
+            perl-shared/ntmake-build perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm  perl-shared/RRDs.xs perl-shared/t/base.t \
             ruby/CHANGES     ruby/README      ruby/extconf.rb  ruby/main.c      ruby/test.rb \
              python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrdtoolmodule.c python/setup.py
 

diff --git a/program/bindings/perl-shared/MANIFEST b/program/bindings/perl-shared/MANIFEST
index 664d2315a9bcef8fbdf67c4efebe73a3cf6802c2..0f30b7eb29a8e2d0466e722785b8148e0740da19 100644 (file)
--- a/program/bindings/perl-shared/MANIFEST
+++ b/program/bindings/perl-shared/MANIFEST
@@ -1,4 +1,4 @@
-ntmake.pl
+ntmake-build
 MANIFEST
 README
 Makefile.PL

diff --git a/program/bindings/perl-shared/ntmake-build b/program/bindings/perl-shared/ntmake-build
new file mode 100644 (file)
index 0000000..047b76f
--- /dev/null
+++ b/program/bindings/perl-shared/ntmake-build
@@ -0,0 +1,27 @@
+use ExtUtils::MakeMaker;
+use Config;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+# Run VCVARS32.BAT before generating makefile/compiling.
+WriteMakefile(
+    'NAME'     => 'RRDs',
+    'VERSION_FROM' => 'RRDs.pm',
+#    'DEFINE'     => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+# keep compatible w/ ActiveState 5xx builds
+    'DEFINE'      => "-DPERLPATCHLEVEL=5",
+
+   'INC'       => '-I../../src/ "-I/Program Files/GnuWin32/include"',
+# Since we are now using GnuWin32 libraries dynamically (instead of static
+# complile with code redistributed with rrdtool), use /MD instead of /MT.
+# Yes, this means we need msvcrt.dll but GnuWin32 dlls already require it
+# and it is available on most versions of Windows.
+   'OPTIMIZE' => '-O2 -MD',
+   'LIBS'  => '../../src/release/rrd.lib "/Program Files/GnuWin32/lib/libart_lgpl.lib" "/Program Files/GnuWin32/lib/libz.lib" "/Program Files/GnuWin32/lib/libpng.lib" "/Program Files/GnuWin32/lib/libfreetype.lib"', 
+    'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
+    ($] ge '5.005') ? (
+        'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
+        'ABSTRACT' => 'Round Robin Database Tool',
+    ) : ()
+
+
+);

diff --git a/program/bindings/perl-shared/ntmake.PL b/program/bindings/perl-shared/ntmake.PL
deleted file mode 100644 (file)
index 047b76f..0000000
--- a/program/bindings/perl-shared/ntmake.PL
+++ /dev/null
@@ -1,27 +0,0 @@
-use ExtUtils::MakeMaker;
-use Config;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-# Run VCVARS32.BAT before generating makefile/compiling.
-WriteMakefile(
-    'NAME'     => 'RRDs',
-    'VERSION_FROM' => 'RRDs.pm',
-#    'DEFINE'     => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
-# keep compatible w/ ActiveState 5xx builds
-    'DEFINE'      => "-DPERLPATCHLEVEL=5",
-
-   'INC'       => '-I../../src/ "-I/Program Files/GnuWin32/include"',
-# Since we are now using GnuWin32 libraries dynamically (instead of static
-# complile with code redistributed with rrdtool), use /MD instead of /MT.
-# Yes, this means we need msvcrt.dll but GnuWin32 dlls already require it
-# and it is available on most versions of Windows.
-   'OPTIMIZE' => '-O2 -MD',
-   'LIBS'  => '../../src/release/rrd.lib "/Program Files/GnuWin32/lib/libart_lgpl.lib" "/Program Files/GnuWin32/lib/libz.lib" "/Program Files/GnuWin32/lib/libpng.lib" "/Program Files/GnuWin32/lib/libfreetype.lib"', 
-    'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
-    ($] ge '5.005') ? (
-        'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
-        'ABSTRACT' => 'Round Robin Database Tool',
-    ) : ()
-
-
-);