diff --git a/libisoburn/trunk/xorriso/make_xorriso_standalone.sh b/libisoburn/trunk/xorriso/make_xorriso_standalone.sh index acce1f01..3810964d 100755 --- a/libisoburn/trunk/xorriso/make_xorriso_standalone.sh +++ b/libisoburn/trunk/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/' \ - "$lone_dir"/xorriso/xorriso_main.c + "$lone_dir"/xorriso/xorriso.h else diff --git a/libisoburn/trunk/xorriso/xorriso.h b/libisoburn/trunk/xorriso/xorriso.h index 1519749e..75d13952 100644 --- a/libisoburn/trunk/xorriso/xorriso.h +++ b/libisoburn/trunk/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 ------------------- */ diff --git a/libisoburn/trunk/xorriso/xorriso_main.c b/libisoburn/trunk/xorriso/xorriso_main.c index 1c605f03..10a0fe9f 100644 --- a/libisoburn/trunk/xorriso/xorriso_main.c +++ b/libisoburn/trunk/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 #include #include diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index d011704b..6aad2745 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.05.16.093108" +#define Xorriso_timestamP "2010.05.16.113100"