Another attempt at coming up with Makefile rules that work for

both Linux and BSD.

diff --git a/Makefile.am b/Makefile.am
index 925dcbc4cf3649be8fdcaa178985f3bbf4b7551f..a65839e585c8b8a6c106b747584656251bf80e01 100644 (file)
--- 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 f86e8eb97299394a7abf3b04def3c7a15045b4ce..2199418761a220e37076c926cdb9cb131503b9b2 100644 (file)
--- 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 d4dc1d120f57c40c39cca329856d879b9a27f2b2..f7c56ee5e987d8ccfffd7250560104db726b1e02 100644 (file)
--- 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 f7f45de7d03b1558095d91bf6ea620d59ad2374a..e6341db6f9cb67b035ba3a074d2f1e33c4fd05d9 100755 (executable)
--- 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 0e20240ba7d7c75bec8790c1ad9a9c04987a9a47..c3c6cbfb918740d35f6ba73628bef1ce501a033d 100644 (file)
--- 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 4976ddb6712da14ca860c5b7dca23b2f1f5691ad..2d45b79821823381716bcc0f07be53bba7f9cd89 100644 (file)
--- 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 f34d87ee8433ed6b92673b19d2d3f7448cad09ec..94620f810b02a91a1532641b88a292a5b82f3a83 100644 (file)
--- 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 4976ddb6712da14ca860c5b7dca23b2f1f5691ad..2d45b79821823381716bcc0f07be53bba7f9cd89 100644 (file)
--- 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");
 };