makefile cleanup and safety (don't rm -rf)

[ott/enhance] / settings.txt

diff --git a/settings.txt b/settings.txt
index 4d4ab770aff50b11df17e442c322015196021f19..5cccada780237f3265671c0e0e66c1461ba5b0b4 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -19,12 +19,42 @@
 _C_DEFINE_STR: #define $0 "@_ESCAPE($1)"
 # _C_INCLUDE_STR: #include "@_ESCAPE($0)"
 
-_bin_bluenh_path = @_PATH($bin_path, bluenh)
-_bin_npb_path    = @_PATH($bin_path, npb)
+_bin_bluenh_path       = @_PATH($bin_path, bluenh)
+_bin_bluenh_cgi_path   = @_PATH($bin_path, bluenh-cgi)
+_bin_diff_path         = @_PATH($bin_path, diff)
+_bin_diff_cgi_path     = @_PATH($bin_path, diff-cgi)
+_bin_nofading_path     = @_PATH($bin_path, nofading)
+_bin_nofading_cgi_path = @_PATH($bin_path, nofading-cgi)
+_bin_npb_path          = @_PATH($bin_path, npb)
+_bin_npb_cgi_path      = @_PATH($bin_path, npb-cgi)
+_bin_pal_mix_path      = @_PATH($bin_path, pal_mix)
+_bin_pal_mixdiff_path  = @_PATH($bin_path, pal_mixdiff)
+_bin_pal_unmix_path    = @_PATH($bin_path, pal_unmix)
+_bin_pal_cgi_path      = @_PATH($bin_path, pal-cgi)
+_bin_remap_t_1_path    = @_PATH($bin_path, remap_t_1)
+_bin_reveal_path       = @_PATH($bin_path, reveal)
+_bin_reveal_cgi_path   = @_PATH($bin_path, reveal-cgi)
+_bin_t-1_cgi_path      = @_PATH($bin_path, t-1-cgi)
+
+_conf_path = @_PATH($conf_path, $name\.conf)
+
+HTML_TITLE = @_HTML_TITLE()
+
+
+CONF_bin      = $bin_path
+CONF_bluenh   = $_bin_bluenh_cgi_path
+CONF_diff     = $_bin_diff_cgi_path
+CONF_nofading = $_bin_nofading_cgi_path
+CONF_npb      = $_bin_npb_cgi_path
+CONF_pal      = $_bin_pal_cgi_path
+CONF_reveal   = $_bin_reveal_cgi_path
+CONF_t-1      = $_bin_t-1_cgi_path
+
 
 MAKE_CONFIGURE = CONFIGURE = $configure
 MAKE_TARGET    = TARGET    = $target
 
+MAKE_CAT    = CAT  =$cat
 MAKE_CHMOD  = CHMOD=$chmod
 MAKE_CP     = CP   =$cp
 MAKE_MKDIR  = MKDIR=$mkdir
@@ -36,8 +66,12 @@ MAKE_CF    = CF   =$CF
 MAKE_L_IL  = L_IL =$L_IL
 MAKE_L_CGI = L_CGI=$L_CGI
 
+MAKE_CONF = CONF = $_conf_path
+
 MAKE_BIN_PATH = BIN_PATH = $bin_path
 MAKE_TMP_PATH = TMP_PATH = $tmp_path
+MAKE_WWW_PATH = WWW_PATH = $www_path
+
 
 C_USERAGENT = @_C_DEFINE_STR(USERAGENT, $useragent)
 
@@ -45,7 +79,14 @@ C_CP_PATH   = @_C_DEFINE_STR(CP_PATH,   $cp)
 C_WGET_PATH = @_C_DEFINE_STR(WGET_PATH, $wget)
 C_RM_PATH   = @_C_DEFINE_STR(RM_PATH,   $rm)
 
-C_TEMP_PATH = @_C_DEFINE_STR(TEMP_PATH, $_tmp_path)
+C_TEMP_PATH = @_C_DEFINE_STR(TEMP_PATH, $tmp_path)
 
-C_BLUENH_PATH = @_C_DEFINE_STR(BLUENH_PATH, $_bin_bluenh_path)
-C_NPB_PATH    = @_C_DEFINE_STR(NPB_PATH,    $_bin_npb_path)
+C_BLUENH_PATH      = @_C_DEFINE_STR(BLUENH_PATH,      $_bin_bluenh_path)
+C_DIFF_PATH        = @_C_DEFINE_STR(DIFF_PATH,        $_bin_diff_path)
+C_NOFADING_PATH    = @_C_DEFINE_STR(NOFADING_PATH,    $_bin_nofading_path)
+C_NPB_PATH         = @_C_DEFINE_STR(NPB_PATH,         $_bin_npb_path)
+C_PAL_MIX_PATH     = @_C_DEFINE_STR(PAL_MIX_PATH,     $_bin_pal_mix_path)
+C_PAL_MIXDIFF_PATH = @_C_DEFINE_STR(PAL_MIXDIFF_PATH, $_bin_pal_mixdiff_path)
+C_PAL_UNMIX_PATH   = @_C_DEFINE_STR(PAL_UNMIX_PATH,   $_bin_pal_unmix_path)
+C_REMAP_T_1_PATH   = @_C_DEFINE_STR(REMAP_T_1_PATH,   $_bin_remap_t_1_path)
+C_REVEAL_PATH      = @_C_DEFINE_STR(REVEAL_PATH,      $_bin_reveal_path)