From d8921a46af11e38d048b469c8a05faea025ea468 Mon Sep 17 00:00:00 2001 From: Christoph Lipka Date: Mon, 16 Dec 2013 12:40:05 +0100 Subject: [PATCH] fix GitHub issues #5 and #6. corresponds to Perforce changes 6135, 6136. --- unix/configure.ac | 2 +- unix/prebuild.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/unix/configure.ac b/unix/configure.ac index d44d07c..77dd405 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -166,7 +166,7 @@ Environment AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([1.9 dist-bzip2]) +AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"]) diff --git a/unix/prebuild.sh b/unix/prebuild.sh index ff0338e..422b597 100755 --- a/unix/prebuild.sh +++ b/unix/prebuild.sh @@ -40,11 +40,11 @@ # # Note that the 'clean' and 'doc(s)(clean)' options are mutually exclusive. # -# $File: //depot/public/povray/3.x/unix/prebuild.sh $ -# $Revision: #1 $ -# $Change: 6069 $ -# $DateTime: 2013/11/06 11:59:40 $ -# $Author: chrisc $ +# $File: //depot/povray/smp/unix/prebuild.sh $ +# $Revision: #31 $ +# $Change: 6136 $ +# $DateTime: 2013/11/25 16:36:15 $ +# $Author: clipka $ # $Log$ ############################################################################### @@ -353,8 +353,8 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \ for file in \ AUTHORS ChangeLog configure.ac COPYING NEWS README VERSION \ povray.1 povray.conf \ - scripts/ \ - ../distribution/ini/ ../distribution/include/ ../distribution/scenes/ + scripts \ + ../distribution/ini ../distribution/include ../distribution/scenes do out=`basename $file` echo "Create ../$out`test -d $file && echo /`" @@ -724,7 +724,7 @@ aclocal -I . autoheader --warnings=all # Create all Makefile.in's from Makefile.am's -automake --warnings=all --add-missing ###--ignore-deps +automake --add-missing --warnings=all ###--ignore-deps # Create configure from configure.ac autoconf --warnings=all -- 1.8.5.2