diff --git a/unix/prebuild.sh b/unix/prebuild.sh index 34b5a30f7..a3e0f1f3c 100755 --- a/unix/prebuild.sh +++ b/unix/prebuild.sh @@ -328,7 +328,7 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \ chmod -R u+rw ../doc/html/ mv -f ../doc/html/*.txt ../doc/ mv -f ../doc/html/*.doc ../doc/ - $cp_u -f README.unix ../doc/ + $cp_u -f prebuild/README.unix ../doc/ chmod -R u+rw ../doc/ # [C.H.] @@ -356,24 +356,29 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \ *) # some shells seem unable to expand properly wildcards in the list entries # (e.g. ../distribution/in*/). - for file in \ - AUTHORS ChangeLog configure.ac COPYING NEWS README \ - povray.1 povray.conf \ + + # Directories + for dir in \ scripts \ ../distribution/ini ../distribution/include ../distribution/scenes do - out=`basename $file` - echo "Create ../$out`test -d $file && echo /`" - $cp_u -f -R $file ../ || echo "$file not copied !" + out=`basename $dir` + echo "Create ../$out/" + $cp_u -f -R $dir ../ || echo "$dir not copied !" chmod -f -R u+rw ../$out done - # special cases: + # Individual Files + for file in \ + AUTHORS ChangeLog configure.ac COPYING INSTALL NEWS README \ + povray.1 povray.conf + do + echo "Create ../$file" + $cp_u -f prebuild/$file ../ || echo "$file not copied !" + chmod -f -R u+rw ../$file + done - # INSTALL - echo "Create ../INSTALL" - $cp_u -f install.txt ../INSTALL || echo "INSTALL not copied !" - chmod -f u+rw ../INSTALL + # special cases: # VERSION echo "Create ../VERSION" @@ -419,7 +424,7 @@ case "$1" in *) echo "Create $makefile.am" - cat Makefile.header > $makefile.am + cat prebuild/Makefile.header > $makefile.am cat << pbEOF >> $makefile.am # Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX @@ -583,7 +588,7 @@ case "$1" in scriptfiles=`find scripts -type f` echo "Create $makefile.am" - cat Makefile.header > $makefile.am + cat prebuild/Makefile.header > $makefile.am cat << pbEOF >> $makefile.am # Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX @@ -803,7 +808,7 @@ case "$1" in files=`find $dir -name "*.cpp" -or -name "*.h" | sed s,"$dir/",,g | sort` echo "Create $makefile.am" - cat Makefile.header > $makefile.am + cat prebuild/Makefile.header > $makefile.am cat << pbEOF >> $makefile.am # Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX @@ -1340,7 +1345,7 @@ case "$1" in files=`find $dir $dir/unix -maxdepth 1 -name \*.cpp -or -name \*.h | sed s,"$dir/",,g | sort` echo "Create $makefile.am" - cat Makefile.header > $makefile.am + cat prebuild/Makefile.header > $makefile.am cat << pbEOF >> $makefile.am # Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX @@ -1409,7 +1414,7 @@ case "$1" in done echo "Create $makefile.am" - cat Makefile.header > $makefile.am + cat prebuild/Makefile.header > $makefile.am cat << pbEOF >> $makefile.am # Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX diff --git a/unix/AUTHORS b/unix/prebuild/AUTHORS similarity index 100% rename from unix/AUTHORS rename to unix/prebuild/AUTHORS diff --git a/unix/COPYING b/unix/prebuild/COPYING similarity index 100% rename from unix/COPYING rename to unix/prebuild/COPYING diff --git a/unix/ChangeLog b/unix/prebuild/ChangeLog similarity index 100% rename from unix/ChangeLog rename to unix/prebuild/ChangeLog diff --git a/unix/install.txt b/unix/prebuild/INSTALL similarity index 99% rename from unix/install.txt rename to unix/prebuild/INSTALL index c023eb753..b5edc8bd1 100644 --- a/unix/install.txt +++ b/unix/prebuild/INSTALL @@ -13,7 +13,7 @@ news://news.povray.org/povray.unix/ or http://news.povray.org/povray.unix/ | source package, you have received a platform-neutral package. In that case | | make sure to run the following command before you proceed: | | | -| cd unix/ ; ./prebuild.sh ; cd ../ | +| unix/prebuild.sh | +----------------------------------------------------------------------------+ Table of contents diff --git a/unix/Makefile.header b/unix/prebuild/Makefile.header similarity index 100% rename from unix/Makefile.header rename to unix/prebuild/Makefile.header diff --git a/unix/NEWS b/unix/prebuild/NEWS similarity index 100% rename from unix/NEWS rename to unix/prebuild/NEWS diff --git a/unix/README b/unix/prebuild/README similarity index 100% rename from unix/README rename to unix/prebuild/README diff --git a/unix/README.unix b/unix/prebuild/README.unix similarity index 100% rename from unix/README.unix rename to unix/prebuild/README.unix diff --git a/unix/configure.ac b/unix/prebuild/configure.ac similarity index 100% rename from unix/configure.ac rename to unix/prebuild/configure.ac diff --git a/unix/prebuild/dirinfo.dox b/unix/prebuild/dirinfo.dox new file mode 100644 index 000000000..723ca9e92 --- /dev/null +++ b/unix/prebuild/dirinfo.dox @@ -0,0 +1,18 @@ +/** + +@dir +@brief Files to be moved around or used as input by the `unix/prebuild.sh` script. + +This directory primarily contains Unix-specific files that, in a Unix-specific source package, +should be residing in locations that either do not exist in the repository, or which we want to +keep free from platform-specific clutter there. + +The files need to be processed and/or moved to their final locations by the `unix/prebuild.sh` +script, which is to be run on the "raw" source package - as stored in the repository - before +running the Autotools-based Unix build process proper (`configure`/`make`). + +@note + The originals residing in this directory are not required for the build process proper, and + should therefore not be included in a Unix-specific source package. + +*/ diff --git a/unix/povray.1 b/unix/prebuild/povray.1 similarity index 100% rename from unix/povray.1 rename to unix/prebuild/povray.1 diff --git a/unix/povray.conf b/unix/prebuild/povray.conf similarity index 100% rename from unix/povray.conf rename to unix/prebuild/povray.conf