| d8856bdf | 2016-10-01 15:02:43 | Timothy Pearson |
Fix FTBFS on Debian |
||
|
M clients/tde/debian/rules M lib/libtdekrb/debian/rules M lib/libtqtrla/debian/rules M servers/admin_sys_ctl_server_lin/debian/rules M servers/admin_user_mgmt_server_lin/debian/rules M servers/auth_server_lin/debian/rules M servers/fpga_programming_server_lin/debian/rules M servers/fpga_server_lin/debian/rules M servers/gpib_server_lin/debian/rules M servers/logic_analyzer_server_lin/debian/rules M servers/sensor_monitor_server_lin/debian/rules M servers/serial_server_lin/debian/rules |
||
diff --git a/clients/tde/debian/rules b/clients/tde/debian/rules index 0316512..16f6871 100755 --- a/clients/tde/debian/rules +++ b/clients/tde/debian/rules @@ -23,12 +23,17 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - + make -f admin/Makefile.common cvs touch debian/stamp-bootstrap diff --git a/lib/libtdekrb/debian/rules b/lib/libtdekrb/debian/rules index 9bed17b..09e1e03 100755 --- a/lib/libtdekrb/debian/rules +++ b/lib/libtdekrb/debian/rules @@ -17,10 +17,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/lib/libtqtrla/debian/rules b/lib/libtqtrla/debian/rules index 9bed17b..09e1e03 100755 --- a/lib/libtqtrla/debian/rules +++ b/lib/libtqtrla/debian/rules @@ -17,10 +17,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/admin_sys_ctl_server_lin/debian/rules b/servers/admin_sys_ctl_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/admin_sys_ctl_server_lin/debian/rules +++ b/servers/admin_sys_ctl_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/admin_user_mgmt_server_lin/debian/rules b/servers/admin_user_mgmt_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/admin_user_mgmt_server_lin/debian/rules +++ b/servers/admin_user_mgmt_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/auth_server_lin/debian/rules b/servers/auth_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/auth_server_lin/debian/rules +++ b/servers/auth_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/fpga_programming_server_lin/debian/rules b/servers/fpga_programming_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/fpga_programming_server_lin/debian/rules +++ b/servers/fpga_programming_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/fpga_server_lin/debian/rules b/servers/fpga_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/fpga_server_lin/debian/rules +++ b/servers/fpga_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/gpib_server_lin/debian/rules b/servers/gpib_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/gpib_server_lin/debian/rules +++ b/servers/gpib_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/logic_analyzer_server_lin/debian/rules b/servers/logic_analyzer_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/logic_analyzer_server_lin/debian/rules +++ b/servers/logic_analyzer_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/sensor_monitor_server_lin/debian/rules b/servers/sensor_monitor_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/sensor_monitor_server_lin/debian/rules +++ b/servers/sensor_monitor_server_lin/debian/rules @@ -14,10 +14,15 @@ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ +endif +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs diff --git a/servers/serial_server_lin/debian/rules b/servers/serial_server_lin/debian/rules index 242fb2c..6f9d696 100755 --- a/servers/serial_server_lin/debian/rules ** Diff limit reached (max: 250 lines) ** |
||