diff -U 3 -H -d -r -N -- ftsh-2_0_3.orig/configure ftsh-2_0_3/configure --- ftsh-2_0_3.orig/configure 2003-07-08 18:19:17.000000000 +0200 +++ ftsh-2_0_3/configure 2004-03-16 23:10:08.017817976 +0100 @@ -15,6 +15,7 @@ ccflags="-Wall -g -fPIC -fno-exceptions -D_REENTRANT -DFTSH_VERSION_MAJOR=$major -DFTSH_VERSION_MINOR=$minor -DFTSH_VERSION_MICRO=$micro \"-DBUILD_USER=\\\"$build_user\\\"\" \"-DBUILD_HOST=\\\"$build_host\\\"\"" install_dir="/usr/local" dttools_dir="/usr/local" +dttools_include_dir="/usr/local" IFS=" =" export IFS @@ -30,6 +31,10 @@ shift dttools_dir="$1" ;; + --with-dttools-include-path) + shift + dttools_include_dir="$1" + ;; --with-*-path) echo "ignoring unknown package $1" shift @@ -42,8 +47,9 @@ cat < The directory in which to install $project - --with-dttools-path The path to the dttools package + --prefix The directory in which to install $project + --with-dttools-path The path to the dttools package + --with-dttools-include-path The path to the dttools include package --help Show this message EOF exit 1 @@ -66,9 +72,9 @@ require_gnu_make require_library pthread -require_package dttools "${dttools_dir}/include/list.h" "${dttools_dir}" +require_package dttools "${dttools_include_dir}/list.h" "${dttools_dir}" "${dttools_include_dir}" -if check_function hash_table_size ${dttools_dir}/include/hash_table.h +if check_function hash_table_size ${dttools_include_dir}/hash_table.h then true else diff -U 3 -H -d -r -N -- ftsh-2_0_3.orig/configure.tools ftsh-2_0_3/configure.tools --- ftsh-2_0_3.orig/configure.tools 2003-04-22 17:56:55.000000000 +0200 +++ ftsh-2_0_3/configure.tools 2004-03-16 23:41:22.931787728 +0100 @@ -127,8 +127,9 @@ { if check_package $1 $2 then - ccflags="${ccflags} -I$3/include" + ccflags="${ccflags} -I$4" ldflags="${ldflags} -L$3/lib -l$1" + return 0 else echo "Sorry, I can't proceed without the $1 package"; diff -U 3 -H -d -r -N -- ftsh-2_0_3.orig/doc/Makefile ftsh-2_0_3/doc/Makefile --- ftsh-2_0_3.orig/doc/Makefile 2002-10-09 19:10:06.000000000 +0200 +++ ftsh-2_0_3/doc/Makefile 2004-03-16 23:37:14.769514128 +0100 @@ -7,5 +7,5 @@ clean: install: - install -d ${INSTALL_DIR}/doc - install ftsh.html ${INSTALL_DIR}/doc/ftsh.html + install -d ${DESTDIR}/${INSTALL_DIR}/share/doc/ftsh-2.0.3 + install ftsh.html ${DESTDIR}/${INSTALL_DIR}/share/doc/ftsh-2.0.3/ftsh.html diff -U 3 -H -d -r -N -- ftsh-2_0_3.orig/src/Makefile ftsh-2_0_3/src/Makefile --- ftsh-2_0_3.orig/src/Makefile 2003-07-08 18:19:19.000000000 +0200 +++ ftsh-2_0_3/src/Makefile 2004-03-16 23:34:27.253980360 +0100 @@ -24,8 +24,8 @@ ${LEX} ${LEXFLAGS} -t scanner.l > scanner.c install: all - install -d ${INSTALL_DIR}/bin - install ftsh ${INSTALL_DIR}/bin + install -d ${DESTDIR}/${INSTALL_DIR}/bin + install ftsh ${DESTDIR}/${INSTALL_DIR}/bin clean: rm -f ${PROGRAMS} ${OBJECTS} ${LIBRARIES} parser.tab.c parser.tab.h scanner.c *~ diff -U 3 -H -d -r -N -- ftsh-2_0_3.orig/src/ftsh.c ftsh-2_0_3/src/ftsh.c --- ftsh-2_0_3.orig/src/ftsh.c 2003-04-22 17:41:32.000000000 +0200 +++ ftsh-2_0_3/src/ftsh.c 2004-03-16 23:15:58.785493184 +0100 @@ -41,32 +41,32 @@ static void show_help( char *cmd ) { show_version(cmd); - fprintf(stderr,"\ -Use: ftsh [options] [arg1] [arg2]\n\ -Where options are:\n\ - -f Log file. - Default is the standard error.\n\ - Overrides environment variable FTSH_LOG_FILE.\n\ - -l Log level. Default is '10'.\n\ - 0 = log nothing\n\ - 10 = log failed commands\n\ - 20 = log all commands\n\ - 30 = log program structures\n\ - 40 = log process and signal activity\n\ - Overrides environment variable FTSH_LOG_LEVEL.\n\ - -D Log time values in decimal format.\n\ - Overrides environment variable FTSH_LOG_DECIMAL.\n\ - -t Kill timeout. Default is '30'.\n\ - Number of seconds between soft kill and hard kill. - Overrides environment variable FTSH_KILL_TIMEOUT.\n\ - -k Kill mode. Default is 'strong'.\n\ - May be 'weak' or 'strong'.\n\ - Overrides environment variable FTSH_KILL_MODE.\n\ - -p Parse and print program, but do not execute.\n\ - -P Parse and print program, including parser debug log.\n\ - -v Show version string.\n\ - -h Show this help screen.\n\ -"); + fprintf(stderr, +"Use: ftsh [options] [arg1] [arg2]\n" \ +"Where options are:\n" \ +" -f Log file.\n" \ +" Default is the standard error.\n" \ +" Overrides environment variable FTSH_LOG_FILE.\n" \ +" -l Log level. Default is '10'.\n" \ +" 0 = log nothing\n" \ +" 10 = log failed commands\n" \ +" 20 = log all commands\n" \ +" 30 = log program structures\n" \ +" 40 = log process and signal activity\n" \ +" Overrides environment variable FTSH_LOG_LEVEL.\n" \ +" -D Log time values in decimal format.\n" \ +" Overrides environment variable FTSH_LOG_DECIMAL.\n" \ +" -t Kill timeout. Default is '30'.\n" \ +" Number of seconds between soft kill and hard kill.\n" \ +" Overrides environment variable FTSH_KILL_TIMEOUT.\n" \ +" -k Kill mode. Default is 'strong'.\n" \ +" May be 'weak' or 'strong'.\n" \ +" Overrides environment variable FTSH_KILL_MODE.\n" \ +" -p Parse and print program, but do not execute.\n" \ +" -P Parse and print program, including parser debug log.\n" \ +" -v Show version string.\n" \ +" -h Show this help screen.\n" +); } diff -U 3 -H -d -r -N -- ftsh-2_0_3.orig/test/expr.expect ftsh-2_0_3/test/expr.expect --- ftsh-2_0_3.orig/test/expr.expect 2003-07-07 21:55:55.000000000 +0200 +++ ftsh-2_0_3/test/expr.expect 2004-03-16 23:30:41.208344520 +0100 @@ -106,14 +106,20 @@ a writeable a is a file a exists +a readable +a writeable a is a file a exists a readable +a writeable a is a file a exists +a readable a writeable a is a file a exists +a readable +a writeable a executable a is a file g exists @@ -127,4 +133,5 @@ h is a file i exists i readable +i writeable i is a link