rename configure.ac to old.configure.ac .. and adjust testbuilds/*-am*.dockerfile...

diff --git a/configure b/old.configure
similarity index 100%
rename from configure
rename to old.configure

diff --git a/configure.ac b/old.configure.ac
similarity index 100%
rename from configure.ac
rename to old.configure.ac

diff --git a/testbuilds/centos7-am-build.dockerfile b/testbuilds/centos7-am-build.dockerfile
index 4a2f83740393ef840e4e8835496c5d5c39bf4664..850d437a1995d1de89b674c99f7b6e206da7dacb 100644 (file)
--- a/testbuilds/centos7-am-build.dockerfile
+++ b/testbuilds/centos7-am-build.dockerfile
@@ -10,9 +10,13 @@ RUN echo sslverify=false >> /etc/yum.conf
 RUN yum install -y gcc zlib-devel python3 make unzip zip gzip tar
 
 RUN mkdir src
-COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-COPY Makefile.am Makefile.in configure.ac configure config.h.in zziplib.spec src/
+COPY Makefile.am Makefile.in old.configure.ac old.configure config.h.in zziplib.spec src/
+RUN test ! -f src/old.configure || mv src/old.configure src/configure
+RUN test ! -f src/old.configure.ac || mv src/old.configure.ac src/configure.ac
 COPY uses src/uses
+
+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
+COPY CMakeScripts src/CMakeScripts
 COPY bins src/bins
 COPY docs src/docs
 COPY test src/test

diff --git a/testbuilds/centos7-am-docs.dockerfile b/testbuilds/centos7-am-docs.dockerfile
index f101ba5ab19a6e2edfa726c235592e20d252a397..a9430cf364432df6c0a3bfa5176f497fc9a28b93 100644 (file)
--- a/testbuilds/centos7-am-docs.dockerfile
+++ b/testbuilds/centos7-am-docs.dockerfile
@@ -9,9 +9,13 @@ RUN echo sslverify=false >> /etc/yum.conf
 RUN yum install -y gcc zlib-devel python3 make unzip zip gzip tar
 
 RUN mkdir src
-COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-COPY Makefile.am Makefile.in configure.ac configure config.h.in zziplib.spec src/
+COPY Makefile.am Makefile.in old.configure.ac old.configure config.h.in zziplib.spec src/
+RUN test ! -f src/old.configure || mv src/old.configure src/configure
+RUN test ! -f src/old.configure.ac || mv src/old.configure.ac src/configure.ac
 COPY uses src/uses
+
+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
+COPY CMakeScripts src/CMakeScripts
 COPY bins src/bins
 COPY docs src/docs
 COPY test src/test

diff --git a/testbuilds/centos7-am-sdl2.dockerfile b/testbuilds/centos7-am-sdl2.dockerfile
index 19448d40987b655f8997b160219f689125604cd0..d908c639e653fdce3aa241695c45c37426ef4780 100644 (file)
--- a/testbuilds/centos7-am-sdl2.dockerfile
+++ b/testbuilds/centos7-am-sdl2.dockerfile
@@ -10,9 +10,13 @@ RUN echo sslverify=false >> /etc/yum.conf
 RUN yum install -y gcc zlib-devel python3 make unzip zip gzip tar  SDL2-devel
 
 RUN mkdir src
-COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-COPY Makefile.am Makefile.in configure.ac configure config.h.in zziplib.spec src/
+COPY Makefile.am Makefile.in old.configure.ac old.configure config.h.in zziplib.spec src/
+RUN test ! -f src/old.configure || mv src/old.configure src/configure
+RUN test ! -f src/old.configure.ac || mv src/old.configure.ac src/configure.ac
 COPY uses src/uses
+
+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
+COPY CMakeScripts src/CMakeScripts
 COPY bins src/bins
 COPY docs src/docs
 COPY test src/test

diff --git a/testbuilds/centos8-am-build.dockerfile b/testbuilds/centos8-am-build.dockerfile
index e9dbe4e5dc2affb0a4405c5ec3061e7335d06dd8..0e9b178b90a66a39dbc3408d8543958a61ce0a7e 100644 (file)
--- a/testbuilds/centos8-am-build.dockerfile
+++ b/testbuilds/centos8-am-build.dockerfile
@@ -8,9 +8,13 @@ ARG _docdir=/usr/share/doc
 RUN yum install -y gcc zlib-devel python3 cmake make unzip zip gzip tar diffutils
 
 RUN mkdir src
-COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-COPY Makefile.am Makefile.in configure.ac configure config.h.in zziplib.spec src/
+COPY Makefile.am Makefile.in old.configure.ac old.configure config.h.in zziplib.spec src/
+RUN test ! -f src/old.configure || mv src/old.configure src/configure
+RUN test ! -f src/old.configure.ac || mv src/old.configure.ac src/configure.ac
 COPY uses src/uses
+
+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
+COPY CMakeScripts src/CMakeScripts
 COPY bins src/bins
 COPY docs src/docs
 COPY test src/test

diff --git a/testbuilds/centos8-am-sdl2.dockerfile b/testbuilds/centos8-am-sdl2.dockerfile
index bfcb16f2f5ed836026b74390f82f4a1d8cad9fee..8acef9e222ec5797779a64f4b1e41c26a2d2c734 100644 (file)
--- a/testbuilds/centos8-am-sdl2.dockerfile
+++ b/testbuilds/centos8-am-sdl2.dockerfile
@@ -13,9 +13,13 @@ RUN yum search sdl
 RUN yum install -y gcc zlib-devel python3 cmake make unzip zip gzip tar diffutils  SDL2-devel
 
 RUN mkdir src
-COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-COPY Makefile.am Makefile.in configure.ac configure config.h.in zziplib.spec src/
+COPY Makefile.am Makefile.in old.configure.ac old.configure config.h.in zziplib.spec src/
+RUN test ! -f src/old.configure || mv src/old.configure src/configure
+RUN test ! -f src/old.configure.ac || mv src/old.configure.ac src/configure.ac
 COPY uses src/uses
+
+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
+COPY CMakeScripts src/CMakeScripts
 COPY bins src/bins
 COPY docs src/docs
 COPY test src/test