1 Index: fush-0-9-0/configure.in
2 ===================================================================
3 --- fush-0-9-0.orig/configure.in 2005-01-19 17:52:07.000000000 -0600
4 +++ fush-0-9-0/configure.in 2005-01-19 17:54:08.000000000 -0600
9 -AC_OUTPUT([Makefile src/Makefile])
12 if test -s $USER_HOME; then
13 echo "configuration directory: $USER_HOME";
14 - echo "#define _CONFIGDIR_ \"$USER_HOME\"" >> config.h
17 - echo "configuration directory: $prefix/etc/fush";
18 - echo "#define _CONFIGDIR_ \"$prefix/etc/fush\"" >> config.h
19 - CONFDIR="$prefix/etc/fush"
20 + echo "configuration directory: $sysconfdir/fush";
21 + CONFDIR="$sysconfdir/fush"
23 +PATH_DEFS="$PATH_DEFS -D_CONFIGDIR_=\\\"$CONFDIR\\\" -D_BINDIR_=\\\"\$(bindir)\\\" -D_PREFIX_=\\\"\$(prefix)\\\" -D_SYSCONFDIR_=\\\"\$(sysconfdir)\\\""
27 if test $ac_cv_lib_readline_readline_ != yes; then
28 AC_WARN(readline(3) library not be found. fush was built but will have reduced functionality. Command entry without readline(3) is on the roadmap for version 1.2. Send a message to the support forum on http://sourceforge.net/projects/foosh to increase priority for this support.)
31 -echo "#define _PREFIX_ \"$prefix\"" >> config.h
32 +AC_OUTPUT([Makefile src/Makefile])
33 Index: fush-0-9-0/src/Makefile.in
34 ===================================================================
35 --- fush-0-9-0.orig/src/Makefile.in 2005-01-19 17:52:07.000000000 -0600
36 +++ fush-0-9-0/src/Makefile.in 2005-01-19 17:52:08.000000000 -0600
39 -CFLAGS = -Wall @CFLAGS@ @CPPFLAGS@ @DEFS@
40 +CFLAGS = -Wall @CFLAGS@ @CPPFLAGS@ @DEFS@ @PATH_DEFS@
41 LDFLAGS = @LDFLAGS@ @LIBS@
42 OBJS = fush.o fushtools.o fuparse.o md5.o linklist.o @PWCACHE_OBJS@
43 ADMOBJS = fushadmin.o md5.o
44 Index: fush-0-9-0/src/fushadmin.c
45 ===================================================================
46 --- fush-0-9-0.orig/src/fushadmin.c 2004-01-25 18:52:01.000000000 -0600
47 +++ fush-0-9-0/src/fushadmin.c 2005-01-19 17:53:43.000000000 -0600
49 # set to the main system wide profile (cshrc, zshenv, bashrc, etc...)\n\
50 # special note: fush will not correctly process if then statements etc...\n\
51 # (set to 'no' to disable)\n\
52 -fu_system_rc=/etc/profile\n\
53 +fu_system_rc=" _SYSCONFDIR_ "/profile\n\
55 # home system profile (the users home dir is auto prepended)\n\
56 # (set to 'no' to disable)\n\
58 # enable home .fushrc profile (yes or no)\n\
61 -# enable system _CONFIGDIR_/fushrc profile (yes or no)\n\
62 +# enable system " _CONFIGDIR_ "/fushrc profile (yes or no)\n\
63 fu_use_systemrc=yes\n\
65 # maximum number of backgrounded commands\n\
67 subst_command emacs=rvim\n\
69 # command substitutions, by fullpath\n\
70 -subst_path /bin/sh=/usr/local/bin/fush\n\
71 +subst_path /bin/sh=" _BINDIR_ "/fush\n\
74 # policy enforced environment variables\n\
76 set_env DT_RUN_PATH=\n\
78 set_env LD_LIBRARY_PATH=\n\
79 -set_env SHELL=/usr/local/bin/fush\n\
80 +set_env SHELL=" _BINDIR_ "/fush\n\
84 Index: fush-0-9-0/src/fushtools.c
85 ===================================================================
86 --- fush-0-9-0.orig/src/fushtools.c 2005-01-19 17:52:07.000000000 -0600
87 +++ fush-0-9-0/src/fushtools.c 2005-01-19 17:52:08.000000000 -0600
89 fu_add_value( &g_seconf, "fu_logical_and", "yes" );
91 /* default for system resource script */
92 - fu_add_value( &g_seconf, "fu_system_rc", "/etc/profile" );
93 + fu_add_value( &g_seconf, "fu_system_rc", _CONFIGDIR_ "/profile" );
95 /* default for home resource script */
96 fu_add_value( &g_seconf, "fu_home_rc", ".profile" );