From dac74dcdfec20f5ac0c59352b32fd7190df9eeba Mon Sep 17 00:00:00 2001 From: Markus Gutschke Date: Fri, 9 Jul 2010 17:22:26 +0000 Subject: [PATCH] Another attempt at coming up with Makefile rules that work for both Linux and BSD. --- Makefile.am | 20 ++++++++++---------- Makefile.in | 20 ++++++++++---------- config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index 925dcbc..a65839e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,43 +158,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav \ ${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css @rm -f "$@" - sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@" + sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$?" >"$@" ${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h @src="${top_srcdir}/shellinabox/shellinaboxd.man.in"; \ diff --git a/Makefile.in b/Makefile.in index f86e8eb..2199418 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1172,43 +1172,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav \ ${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css @rm -f "$@" - sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@" + sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$?" >"$@" ${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" ${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js @rm -f "$@" - ln "$^" "$@" + ln "$?" "$@" shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h @src="${top_srcdir}/shellinabox/shellinaboxd.man.in"; \ diff --git a/config.h b/config.h index d4dc1d1..f7c56ee 100644 --- a/config.h +++ b/config.h @@ -153,7 +153,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "209" +#define VCS_REVISION "210" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index f7f45de..e6341db 100755 --- a/configure +++ b/configure @@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=209 +VCS_REVISION=210 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 0e20240..c3c6cbf 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.10, markus@shellinabox.com) -VCS_REVISION=209 +VCS_REVISION=210 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/vt100.js b/demo/vt100.js index 4976ddb..2d45b79 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 209)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 210)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index f34d87e..94620f8 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 209)" + + alert("Shell In A Box version " + "2.10 (revision 210)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 4976ddb..2d45b79 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 209)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 210)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; -- 2.45.1