exec is now external dependency, not submodule

diff --git a/.gitmodules b/.gitmodules
index 8299156e476d315720ce04774f03e27681f6947b..18429c3cd819a572e8ed07e4da373ea37c33b853 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "exec"]
-       path = exec
-       url = ../../botm/exec
 [submodule "botm-common"]
        path = botm-common
        url = ../../botm/common-perl

diff --git a/exec b/exec
deleted file mode 160000 (submodule)
index 92cf35c..0000000
--- a/exec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 92cf35c0340afcadb39f06248de26e114ad5603c

diff --git a/makefile b/makefile
index c28994811d492c0ee053f72f3b166800452a5938..5ae746867d347f3dace106b95c3ba3617ea8f9e4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -36,6 +36,9 @@ SUDO =/usr/bin/sudo
 
 CONFIGURE = $(PERL) /botm/bin/config-1.3/configure.pl
 
+EXEC_C        = /botm/lib/exec/exec.c
+EXEC_SETTINGS = /botm/lib/exec/settings.txt
+
 BIN_PATH        = /botm/bin/test-bsta
 DATA_PATH       = /botm/data/test-bsta
 DATA_WORDS_PATH = /botm/data/test-bsta/words
@@ -161,8 +164,8 @@ makefile: makefile.1.mak $(CONFIGFILE)
 $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
        $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
-$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt
-       $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c
+$(PERL_WRAP_EXEC): %:
+       $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log $(EXEC_SETTINGS) --in $(EXEC_C) --out $*.c
        $(CC) $(CF) -o $@ $*.c
 
 exec: $(EXEC)

diff --git a/makefile.1.mak b/makefile.1.mak
index 8cb3534910b1d26f68516ac9a202577960f3a266..d811fdf727d39d78025ee52df4bbdfa74b3cdf6e 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -36,6 +36,9 @@ CONFIGURE = botm-config
 
 ###MAKE_CONFIGURE: CONFIGURE = perl /botm/bin/config-1.3/configure.pl
 
+###MAKE_EXEC_C: EXEC_C               = /botm/lib/exec/exec.c
+###MAKE_EXEC_SETTINGS: EXEC_SETTINGS = /botm/lib/exec/settings.txt
+
 ###MAKE_BIN_PATH:        BIN_PATH        = /botm/bin/bsta
 ###MAKE_DATA_PATH:       DATA_PATH       = /botm/data/bsta
 ###MAKE_DATA_WORDS_PATH: DATA_WORDS_PATH = /botm/data/bsta/words
@@ -161,8 +164,8 @@ makefile: makefile.1.mak $(CONFIGFILE)
 $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
        $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
-$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt
-       $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c
+$(PERL_WRAP_EXEC): %:
+       $(CONFIGURE) --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log $(EXEC_SETTINGS) --in $(EXEC_C) --out $*.c
        $(CC) $(CF) -o $@ $*.c
 
 exec: $(EXEC)

diff --git a/settings-again.txt b/settings-again.txt
index 0026ad7ca4e40a72755b17c994cf1fa95f6760e7..24319d390e1800ebc530fd0e6884ef67cbf4e3a3 100644 (file)
--- a/settings-again.txt
+++ b/settings-again.txt
@@ -56,6 +56,7 @@ sudo : /usr/bin/sudo
 
 oldlogs  : /botm/bin/oldlogs/oldlogs.pl
 configure: /botm/bin/config-1.3/configure.pl
+exec     : /botm/lib/exec
 
 CC: /usr/bin/gcc
 CF: -g -Wall

diff --git a/settings-bsta.txt b/settings-bsta.txt
index e9d554ca12ecfc4697a5daf551fb69c226b3b95c..e89076eba9bbd684820c3cdc1db997245adb64df 100644 (file)
--- a/settings-bsta.txt
+++ b/settings-bsta.txt
@@ -56,6 +56,7 @@ sudo : /usr/bin/sudo
 
 oldlogs  : /botm/bin/oldlogs/oldlogs.pl
 configure: /botm/bin/config-1.3/configure.pl
+exec     : /botm/lib/exec
 
 CC: /usr/bin/gcc
 CF: -g -Wall

diff --git a/settings-debug.txt b/settings-debug.txt
index 5631c5f601d065ad5bdf4ba406fcbc301033b069..76c2265248dcafbf6374cff766ac16a62050b1bc 100644 (file)
--- a/settings-debug.txt
+++ b/settings-debug.txt
@@ -56,6 +56,7 @@ sudo : /usr/bin/sudo
 
 oldlogs  : /botm/bin/oldlogs/oldlogs.pl
 configure: /botm/bin/config-1.3/configure.pl
+exec     : /botm/lib/exec
 
 CC: /usr/bin/gcc
 CF: -g -Wall

diff --git a/settings.txt b/settings.txt
index 16f56919dbab91737d944079d5734f81f7443abc..626e90b04350bfd4268ee3f2d95b76b75fb97b08 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -83,6 +83,9 @@ _ott_url       = @_PATH( $ott_url,      )
 _ott_view_url  = @_PATH( $ott_url, view )
 _ott_mview_url = @_PATH( $ott_url, mview)
 
+_exec_c        = @_PATH( $exec, exec.c)
+_exec_settings = @_PATH( $exec, settings.txt)
+
 
 CONF_BIN        = $_bin_path
 CONF_BIN_2WORDS = $_bin_2words_path
@@ -150,6 +153,9 @@ MAKE_WWW_PATH        = WWW_PATH        = $www_path
 
 MAKE_CONFIGURE = CONFIGURE = \$(PERL) $configure
 
+MAKE_EXEC_C        = EXEC_C        = $_exec_c
+MAKE_EXEC_SETTINGS = EXEC_SETTINGS = $_exec_settings
+
 
 PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path))