From 78e4ddc4b34ac51da55e33bb2c75af573d63caff Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 10 Aug 2021 17:08:44 +0200 Subject: make hydrilla content dir depend on localstatedir and put a readme there --- Makefile.am | 38 +++++++++--- Makefile.in | 162 ++++++++++++++++++++++-------------------------- content_README.txt.in | 3 + src/Makefile.am | 1 + src/Makefile.in | 166 +++++++++++++++++++++++++++++++++++++++++--------- src/main.c | 2 +- 6 files changed, 244 insertions(+), 128 deletions(-) create mode 100644 content_README.txt.in diff --git a/Makefile.am b/Makefile.am index c8975ca..d2937a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,14 @@ ## C program +localstate_lib = $(localstatedir)/lib +localstate_hydrilla = $(localstate_lib)/hydrilla +export contentdir = $(localstate_hydrilla)/content + SUBDIRS = src # data files dist_doc_DATA = README.txt copyright -EXTRA_DIST = examples licenses +EXTRA_DIST = examples licenses content_README.txt.in +CLEANFILES = content_README.txt install_doc: $(srcdir)/examples $(srcdir)/licenses cd $(srcdir) && for D in `find examples licenses -type d`; do \ @@ -17,10 +22,26 @@ uninstall_doc: rm -rf $(DESTDIR)/$(docdir)/examples $(DESTDIR)/$(docdir)/licenses -rmdir $(DESTDIR)/$(docdir) -install-data-local: install_doc -uninstall-local: uninstall_doc +content_README.txt: $(srcdir)/content_README.txt.in $(srcdir)/Makefile + $(subst_perform) < $< > $@ + +install_content_readme: $(srcdir)/content_README.txt + $(MKDIR_P) $(DESTDIR)/$(contentdir) + $(INSTALL_DATA) $< $(DESTDIR)/$(contentdir)/README.txt + +uninstall_content_readme: + rm -rf $(DESTDIR)/$(contentdir)/README.txt + -rmdir $(DESTDIR)/$(contentdir) + -rmdir $(DESTDIR)/$(localstate_hydrilla) + -rmdir $(DESTDIR)/$(localstate_lib) -.PHONY: install-doc uninstall-doc +all all-recursive: $(srcdir)/content_README.txt + +install-data-local: install_doc install_content_readme +uninstall-local: uninstall_doc uninstall_content_readme + +.PHONY: install-doc install_content_readme uninstall-doc \ + uninstall_content_readme ## init scripts transform_name = @program_transform_name@ @@ -28,10 +49,9 @@ hydrilla_new_name = `echo hydrilla | sed '$(transform_name)'` subst_perform = sed -e 's|[@]hydrilla[@]|'$(hydrilla_new_name)'|g' \ -e 's|[@]bindir[@]|$(bindir)|g' \ -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - -e 's|[@]logdir[@]|$(localstatedir)/log|g' - -bin_SCRIPTS = -CLEANFILES = + -e 's|[@]logdir[@]|$(localstatedir)/log|g' \ + -e 's|[@]contentdir[@]|$(contentdir)/log|g' \ + -e 's|[@]docdir[@]|$(docdir)|g' # SysV init script CLEANFILES += daemon/sysv @@ -50,6 +70,8 @@ install-sysv-script: $(srcdir)/daemon/sysv uninstall-sysv-script: rm -f $(sysv_script_dest_path) +all all-recursive: $(srcdir)/daemon/sysv + install-exec-local: install-sysv-script uninstall-local: uninstall-sysv-script diff --git a/Makefile.in b/Makefile.in index 69404ef..7c97c9c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -100,35 +99,6 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docdir)" -SCRIPTS = $(bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -156,6 +126,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -316,22 +314,25 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +localstate_lib = $(localstatedir)/lib +localstate_hydrilla = $(localstate_lib)/hydrilla SUBDIRS = src # data files dist_doc_DATA = README.txt copyright -EXTRA_DIST = examples licenses daemon/sysv.in +EXTRA_DIST = examples licenses content_README.txt.in daemon/sysv.in + +# SysV init script +CLEANFILES = content_README.txt daemon/sysv transform_name = @program_transform_name@ hydrilla_new_name = `echo hydrilla | sed '$(transform_name)'` subst_perform = sed -e 's|[@]hydrilla[@]|'$(hydrilla_new_name)'|g' \ -e 's|[@]bindir[@]|$(bindir)|g' \ -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - -e 's|[@]logdir[@]|$(localstatedir)/log|g' - -bin_SCRIPTS = + -e 's|[@]logdir[@]|$(localstatedir)/log|g' \ + -e 's|[@]contentdir[@]|$(contentdir)/log|g' \ + -e 's|[@]docdir[@]|$(docdir)|g' -# SysV init script -CLEANFILES = daemon/sysv sysv_script_dest_loc = $(DESTDIR)/etc/init.d sysv_script_dest_path = $(sysv_script_dest_loc)/$(hydrilla_new_name) all: config.h @@ -386,41 +387,6 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ @@ -742,10 +708,10 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(SCRIPTS) $(DATA) config.h +all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docdir)"; do \ + for dir in "$(DESTDIR)$(docdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -806,7 +772,7 @@ install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-binSCRIPTS install-exec-local +install-exec-am: install-exec-local install-html: install-html-recursive @@ -846,8 +812,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binSCRIPTS uninstall-dist_docDATA \ - uninstall-local +uninstall-am: uninstall-dist_docDATA uninstall-local .MAKE: $(am__recursive_targets) all install-am install-strip @@ -858,19 +823,20 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_docDATA \ distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-binSCRIPTS install-data install-data-am \ - install-data-local install-dist_docDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-local \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-dist_docDATA uninstall-local + install-data install-data-am install-data-local \ + install-dist_docDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-am uninstall uninstall-am uninstall-dist_docDATA \ + uninstall-local .PRECIOUS: Makefile +export contentdir = $(localstate_hydrilla)/content install_doc: $(srcdir)/examples $(srcdir)/licenses cd $(srcdir) && for D in `find examples licenses -type d`; do \ @@ -884,10 +850,26 @@ uninstall_doc: rm -rf $(DESTDIR)/$(docdir)/examples $(DESTDIR)/$(docdir)/licenses -rmdir $(DESTDIR)/$(docdir) -install-data-local: install_doc -uninstall-local: uninstall_doc +content_README.txt: $(srcdir)/content_README.txt.in $(srcdir)/Makefile + $(subst_perform) < $< > $@ + +install_content_readme: $(srcdir)/content_README.txt + $(MKDIR_P) $(DESTDIR)/$(contentdir) + $(INSTALL_DATA) $< $(DESTDIR)/$(contentdir)/README.txt -.PHONY: install-doc uninstall-doc +uninstall_content_readme: + rm -rf $(DESTDIR)/$(contentdir)/README.txt + -rmdir $(DESTDIR)/$(contentdir) + -rmdir $(DESTDIR)/$(localstate_hydrilla) + -rmdir $(DESTDIR)/$(localstate_lib) + +all all-recursive: $(srcdir)/content_README.txt + +install-data-local: install_doc install_content_readme +uninstall-local: uninstall_doc uninstall_content_readme + +.PHONY: install-doc install_content_readme uninstall-doc \ + uninstall_content_readme $(srcdir)/daemon/sysv: $(srcdir)/daemon/sysv.in $(srcdir)/Makefile $(subst_perform) < $< > $@ @@ -899,6 +881,8 @@ install-sysv-script: $(srcdir)/daemon/sysv uninstall-sysv-script: rm -f $(sysv_script_dest_path) +all all-recursive: $(srcdir)/daemon/sysv + install-exec-local: install-sysv-script uninstall-local: uninstall-sysv-script diff --git a/content_README.txt.in b/content_README.txt.in new file mode 100644 index 0000000..209dd41 --- /dev/null +++ b/content_README.txt.in @@ -0,0 +1,3 @@ +Resources served by Hydrilla can be put here, in +`@contentdir@'. You can find some example resources +under `@docdir@/examples/content'. diff --git a/src/Makefile.am b/src/Makefile.am index eef89a0..88dd22a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,3 +11,4 @@ hydrilla_SOURCES = \ scriptbase.h \ string_buf.h hydrilla_LDFLAGS = -lmicrohttpd -lcjson +hydrilla_CPPFLAGS = -DCONTENTDIR='"$(contentdir)"' diff --git a/src/Makefile.in b/src/Makefile.in index 8faefa7..3bc421b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -99,10 +99,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_hydrilla_OBJECTS = hashtable.$(OBJEXT) main.$(OBJEXT) \ - scriptbase_build.$(OBJEXT) scriptbase_json_query.$(OBJEXT) \ - scriptbase_query.$(OBJEXT) serve.$(OBJEXT) \ - string_buf.$(OBJEXT) +am_hydrilla_OBJECTS = hydrilla-hashtable.$(OBJEXT) \ + hydrilla-main.$(OBJEXT) hydrilla-scriptbase_build.$(OBJEXT) \ + hydrilla-scriptbase_json_query.$(OBJEXT) \ + hydrilla-scriptbase_query.$(OBJEXT) hydrilla-serve.$(OBJEXT) \ + hydrilla-string_buf.$(OBJEXT) hydrilla_OBJECTS = $(am_hydrilla_OBJECTS) hydrilla_LDADD = $(LDADD) hydrilla_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(hydrilla_LDFLAGS) \ @@ -122,12 +123,18 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/hashtable.Po ./$(DEPDIR)/main.Po \ - ./$(DEPDIR)/scriptbase_build.Po \ - ./$(DEPDIR)/scriptbase_json_query.Po \ - ./$(DEPDIR)/scriptbase_query.Po ./$(DEPDIR)/serve.Po \ - ./$(DEPDIR)/string_buf.Po +am__depfiles_remade = ./$(DEPDIR)/hydrilla-hashtable.Po \ + ./$(DEPDIR)/hydrilla-main.Po \ + ./$(DEPDIR)/hydrilla-scriptbase_build.Po \ + ./$(DEPDIR)/hydrilla-scriptbase_json_query.Po \ + ./$(DEPDIR)/hydrilla-scriptbase_query.Po \ + ./$(DEPDIR)/hydrilla-serve.Po \ + ./$(DEPDIR)/hydrilla-string_buf.Po am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) @@ -266,6 +273,7 @@ hydrilla_SOURCES = \ string_buf.h hydrilla_LDFLAGS = -lmicrohttpd -lcjson +hydrilla_CPPFLAGS = -DCONTENTDIR='"$(contentdir)"' all: all-am .SUFFIXES: @@ -352,13 +360,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtable.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scriptbase_build.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scriptbase_json_query.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scriptbase_query.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serve.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_buf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-hashtable.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-scriptbase_build.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-scriptbase_json_query.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-scriptbase_query.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-serve.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hydrilla-string_buf.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -380,6 +388,104 @@ am--depfiles: $(am__depfiles_remade) @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +hydrilla-hashtable.o: hashtable.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-hashtable.o -MD -MP -MF $(DEPDIR)/hydrilla-hashtable.Tpo -c -o hydrilla-hashtable.o `test -f 'hashtable.c' || echo '$(srcdir)/'`hashtable.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-hashtable.Tpo $(DEPDIR)/hydrilla-hashtable.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hashtable.c' object='hydrilla-hashtable.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-hashtable.o `test -f 'hashtable.c' || echo '$(srcdir)/'`hashtable.c + +hydrilla-hashtable.obj: hashtable.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-hashtable.obj -MD -MP -MF $(DEPDIR)/hydrilla-hashtable.Tpo -c -o hydrilla-hashtable.obj `if test -f 'hashtable.c'; then $(CYGPATH_W) 'hashtable.c'; else $(CYGPATH_W) '$(srcdir)/hashtable.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-hashtable.Tpo $(DEPDIR)/hydrilla-hashtable.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hashtable.c' object='hydrilla-hashtable.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-hashtable.obj `if test -f 'hashtable.c'; then $(CYGPATH_W) 'hashtable.c'; else $(CYGPATH_W) '$(srcdir)/hashtable.c'; fi` + +hydrilla-main.o: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-main.o -MD -MP -MF $(DEPDIR)/hydrilla-main.Tpo -c -o hydrilla-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-main.Tpo $(DEPDIR)/hydrilla-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='hydrilla-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c + +hydrilla-main.obj: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-main.obj -MD -MP -MF $(DEPDIR)/hydrilla-main.Tpo -c -o hydrilla-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-main.Tpo $(DEPDIR)/hydrilla-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='hydrilla-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` + +hydrilla-scriptbase_build.o: scriptbase_build.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-scriptbase_build.o -MD -MP -MF $(DEPDIR)/hydrilla-scriptbase_build.Tpo -c -o hydrilla-scriptbase_build.o `test -f 'scriptbase_build.c' || echo '$(srcdir)/'`scriptbase_build.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-scriptbase_build.Tpo $(DEPDIR)/hydrilla-scriptbase_build.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scriptbase_build.c' object='hydrilla-scriptbase_build.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-scriptbase_build.o `test -f 'scriptbase_build.c' || echo '$(srcdir)/'`scriptbase_build.c + +hydrilla-scriptbase_build.obj: scriptbase_build.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-scriptbase_build.obj -MD -MP -MF $(DEPDIR)/hydrilla-scriptbase_build.Tpo -c -o hydrilla-scriptbase_build.obj `if test -f 'scriptbase_build.c'; then $(CYGPATH_W) 'scriptbase_build.c'; else $(CYGPATH_W) '$(srcdir)/scriptbase_build.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-scriptbase_build.Tpo $(DEPDIR)/hydrilla-scriptbase_build.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scriptbase_build.c' object='hydrilla-scriptbase_build.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-scriptbase_build.obj `if test -f 'scriptbase_build.c'; then $(CYGPATH_W) 'scriptbase_build.c'; else $(CYGPATH_W) '$(srcdir)/scriptbase_build.c'; fi` + +hydrilla-scriptbase_json_query.o: scriptbase_json_query.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-scriptbase_json_query.o -MD -MP -MF $(DEPDIR)/hydrilla-scriptbase_json_query.Tpo -c -o hydrilla-scriptbase_json_query.o `test -f 'scriptbase_json_query.c' || echo '$(srcdir)/'`scriptbase_json_query.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-scriptbase_json_query.Tpo $(DEPDIR)/hydrilla-scriptbase_json_query.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scriptbase_json_query.c' object='hydrilla-scriptbase_json_query.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-scriptbase_json_query.o `test -f 'scriptbase_json_query.c' || echo '$(srcdir)/'`scriptbase_json_query.c + +hydrilla-scriptbase_json_query.obj: scriptbase_json_query.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-scriptbase_json_query.obj -MD -MP -MF $(DEPDIR)/hydrilla-scriptbase_json_query.Tpo -c -o hydrilla-scriptbase_json_query.obj `if test -f 'scriptbase_json_query.c'; then $(CYGPATH_W) 'scriptbase_json_query.c'; else $(CYGPATH_W) '$(srcdir)/scriptbase_json_query.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-scriptbase_json_query.Tpo $(DEPDIR)/hydrilla-scriptbase_json_query.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scriptbase_json_query.c' object='hydrilla-scriptbase_json_query.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-scriptbase_json_query.obj `if test -f 'scriptbase_json_query.c'; then $(CYGPATH_W) 'scriptbase_json_query.c'; else $(CYGPATH_W) '$(srcdir)/scriptbase_json_query.c'; fi` + +hydrilla-scriptbase_query.o: scriptbase_query.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-scriptbase_query.o -MD -MP -MF $(DEPDIR)/hydrilla-scriptbase_query.Tpo -c -o hydrilla-scriptbase_query.o `test -f 'scriptbase_query.c' || echo '$(srcdir)/'`scriptbase_query.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-scriptbase_query.Tpo $(DEPDIR)/hydrilla-scriptbase_query.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scriptbase_query.c' object='hydrilla-scriptbase_query.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-scriptbase_query.o `test -f 'scriptbase_query.c' || echo '$(srcdir)/'`scriptbase_query.c + +hydrilla-scriptbase_query.obj: scriptbase_query.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-scriptbase_query.obj -MD -MP -MF $(DEPDIR)/hydrilla-scriptbase_query.Tpo -c -o hydrilla-scriptbase_query.obj `if test -f 'scriptbase_query.c'; then $(CYGPATH_W) 'scriptbase_query.c'; else $(CYGPATH_W) '$(srcdir)/scriptbase_query.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-scriptbase_query.Tpo $(DEPDIR)/hydrilla-scriptbase_query.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='scriptbase_query.c' object='hydrilla-scriptbase_query.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-scriptbase_query.obj `if test -f 'scriptbase_query.c'; then $(CYGPATH_W) 'scriptbase_query.c'; else $(CYGPATH_W) '$(srcdir)/scriptbase_query.c'; fi` + +hydrilla-serve.o: serve.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-serve.o -MD -MP -MF $(DEPDIR)/hydrilla-serve.Tpo -c -o hydrilla-serve.o `test -f 'serve.c' || echo '$(srcdir)/'`serve.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-serve.Tpo $(DEPDIR)/hydrilla-serve.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='serve.c' object='hydrilla-serve.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-serve.o `test -f 'serve.c' || echo '$(srcdir)/'`serve.c + +hydrilla-serve.obj: serve.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-serve.obj -MD -MP -MF $(DEPDIR)/hydrilla-serve.Tpo -c -o hydrilla-serve.obj `if test -f 'serve.c'; then $(CYGPATH_W) 'serve.c'; else $(CYGPATH_W) '$(srcdir)/serve.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-serve.Tpo $(DEPDIR)/hydrilla-serve.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='serve.c' object='hydrilla-serve.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-serve.obj `if test -f 'serve.c'; then $(CYGPATH_W) 'serve.c'; else $(CYGPATH_W) '$(srcdir)/serve.c'; fi` + +hydrilla-string_buf.o: string_buf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-string_buf.o -MD -MP -MF $(DEPDIR)/hydrilla-string_buf.Tpo -c -o hydrilla-string_buf.o `test -f 'string_buf.c' || echo '$(srcdir)/'`string_buf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-string_buf.Tpo $(DEPDIR)/hydrilla-string_buf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='string_buf.c' object='hydrilla-string_buf.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-string_buf.o `test -f 'string_buf.c' || echo '$(srcdir)/'`string_buf.c + +hydrilla-string_buf.obj: string_buf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hydrilla-string_buf.obj -MD -MP -MF $(DEPDIR)/hydrilla-string_buf.Tpo -c -o hydrilla-string_buf.obj `if test -f 'string_buf.c'; then $(CYGPATH_W) 'string_buf.c'; else $(CYGPATH_W) '$(srcdir)/string_buf.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hydrilla-string_buf.Tpo $(DEPDIR)/hydrilla-string_buf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='string_buf.c' object='hydrilla-string_buf.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hydrilla_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hydrilla-string_buf.obj `if test -f 'string_buf.c'; then $(CYGPATH_W) 'string_buf.c'; else $(CYGPATH_W) '$(srcdir)/string_buf.c'; fi` + ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am @@ -507,13 +613,13 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/hashtable.Po - -rm -f ./$(DEPDIR)/main.Po - -rm -f ./$(DEPDIR)/scriptbase_build.Po - -rm -f ./$(DEPDIR)/scriptbase_json_query.Po - -rm -f ./$(DEPDIR)/scriptbase_query.Po - -rm -f ./$(DEPDIR)/serve.Po - -rm -f ./$(DEPDIR)/string_buf.Po + -rm -f ./$(DEPDIR)/hydrilla-hashtable.Po + -rm -f ./$(DEPDIR)/hydrilla-main.Po + -rm -f ./$(DEPDIR)/hydrilla-scriptbase_build.Po + -rm -f ./$(DEPDIR)/hydrilla-scriptbase_json_query.Po + -rm -f ./$(DEPDIR)/hydrilla-scriptbase_query.Po + -rm -f ./$(DEPDIR)/hydrilla-serve.Po + -rm -f ./$(DEPDIR)/hydrilla-string_buf.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -559,13 +665,13 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/hashtable.Po - -rm -f ./$(DEPDIR)/main.Po - -rm -f ./$(DEPDIR)/scriptbase_build.Po - -rm -f ./$(DEPDIR)/scriptbase_json_query.Po - -rm -f ./$(DEPDIR)/scriptbase_query.Po - -rm -f ./$(DEPDIR)/serve.Po - -rm -f ./$(DEPDIR)/string_buf.Po + -rm -f ./$(DEPDIR)/hydrilla-hashtable.Po + -rm -f ./$(DEPDIR)/hydrilla-main.Po + -rm -f ./$(DEPDIR)/hydrilla-scriptbase_build.Po + -rm -f ./$(DEPDIR)/hydrilla-scriptbase_json_query.Po + -rm -f ./$(DEPDIR)/hydrilla-scriptbase_query.Po + -rm -f ./$(DEPDIR)/hydrilla-serve.Po + -rm -f ./$(DEPDIR)/hydrilla-string_buf.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/main.c b/src/main.c index 4902585..0563422 100644 --- a/src/main.c +++ b/src/main.c @@ -29,7 +29,7 @@ errno = VERY_UNLIKELY_TO_COLLIDE_NAME_$$$$$$$$##__LINE__; \ } while (0) -static const char default_search_path[] = "/var/lib/hydrilla/content/"; +static const char default_search_path[] = CONTENTDIR; static int process_scriptbase_subdir(struct scriptbase *base, struct dirent *subdir, -- cgit v1.2.3