Made option -version know again whether it is in GNU xorriso

13 years ago · 8097dd57ab
parent 585075af1b
commit 8097dd57ab
4 changed files with 8 additions and 7 deletions
--- a/xorriso/make_xorriso_standalone.sh
+++ b/xorriso/make_xorriso_standalone.sh
@ -285,7 +285,7 @@ then
  # patch xorriso/xorriso.c to be GNU xorriso
  sed -e's/define Xorriso_libburnia_xorrisO/define Xorriso_GNU_xorrisO/' \
      -e's/This may be changed to Xorriso_GNU_xorrisO in order to c/C/' \
-      <xorriso/xorriso_main.c  >"$lone_dir"/xorriso/xorriso_main.c
+      <xorriso/xorriso.h  >"$lone_dir"/xorriso/xorriso.h

 else

--- a/xorriso/xorriso.h
+++ b/xorriso/xorriso.h
@ -20,6 +20,12 @@ struct XorrisO;
 #define Xorriso_program_patch_leveL ""


+/* This may be changed to Xorriso_GNU_xorrisO in order to create GNU xorriso
+   under GPLv3+ derived from above GPLv2+.
+*/
+#define Xorriso_libburnia_xorrisO yes
+
+
 /* --------------------- Fundamental Management ------------------- */


--- a/xorriso/xorriso_main.c
+++ b/xorriso/xorriso_main.c
@ -84,11 +84,6 @@
 #include "../config.h"
 #endif

-/* This may be changed to Xorriso_GNU_xorrisO in order to create GNU xorriso */
-#define Xorriso_libburnia_xorrisO yes
-
-
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <unistd.h>
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@ -1 +1 @@
-#define Xorriso_timestamP "2010.05.16.093108"
+#define Xorriso_timestamP "2010.05.16.113100"