2010-01-08 Robert Millan <rmh.mkisofs@aybabtu.com>

	* util/mkisofs/defaults.h (APPID_DEFAULT): Redefine using PACKAGE_NAME.
	(SYSTEM_ID_DEFAULT): Set to "GNU" unconditionally.
	* util/mkisofs/mkisofs.c (main): Readjust --version output.

diff --git a/ChangeLog b/ChangeLog
index 749b0e68c073638375f0df84cd88d5cd16d327c7..b1f35e795efc675948eab977a50bf2a10dba0055 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-08  Robert Millan  <rmh.mkisofs@aybabtu.com>
+
+       * util/mkisofs/defaults.h (APPID_DEFAULT): Redefine using PACKAGE_NAME.
+       (SYSTEM_ID_DEFAULT): Set to "GNU" unconditionally.
+       * util/mkisofs/mkisofs.c (main): Readjust --version output.
+
 2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
 
        Reset Multiboot 2 support.  New loader implements the draft in

diff --git a/util/mkisofs/defaults.h b/util/mkisofs/defaults.h
index dc9ad380cd559497d1a334126de5330a45f2c92c..2ce9e8d6bf324f220ba1c4907cb019dba75df0d8 100644 (file)
--- a/util/mkisofs/defaults.h
+++ b/util/mkisofs/defaults.h
@@ -8,7 +8,7 @@
 #define  PREPARER_DEFAULT      NULL
 #define  PUBLISHER_DEFAULT     NULL
 #ifndef        APPID_DEFAULT
-#define  APPID_DEFAULT                 "MKISOFS ISO 9660 FILESYSTEM BUILDER"
+#define  APPID_DEFAULT                 PACKAGE_NAME " ISO 9660 filesystem builder"
 #endif
 #define  COPYRIGHT_DEFAULT     NULL
 #define  BIBLIO_DEFAULT        NULL
@@ -17,38 +17,4 @@
 #define  VOLUME_ID_DEFAULT     "CDROM"
 #define  BOOT_CATALOG_DEFAULT   "boot.catalog"
 #define  BOOT_IMAGE_DEFAULT     NULL
-#ifdef __QNX__
-#define  SYSTEM_ID_DEFAULT     "QNX"
-#endif
-
-#ifdef __osf__
-#define  SYSTEM_ID_DEFAULT     "OSF"
-#endif
-
-#ifdef __sun
-#ifdef __SVR4
-#define  SYSTEM_ID_DEFAULT    "Solaris"
-#else
-#define  SYSTEM_ID_DEFAULT    "SunOS"
-#endif
-#endif
-
-#ifdef __hpux
-#define  SYSTEM_ID_DEFAULT     "HP-UX"
-#endif
-
-#ifdef __sgi
-#define  SYSTEM_ID_DEFAULT     "SGI"
-#endif
-
-#ifdef _AIX
-#define  SYSTEM_ID_DEFAULT     "AIX"
-#endif
-
-#ifdef _WIN
-#define        SYSTEM_ID_DEFAULT       "Win32"
-#endif /* _WIN */
-
-#ifndef SYSTEM_ID_DEFAULT
-#define  SYSTEM_ID_DEFAULT     "LINUX"
-#endif
+#define  SYSTEM_ID_DEFAULT     "GNU"

diff --git a/util/mkisofs/mkisofs.c b/util/mkisofs/mkisofs.c
index 58834523290489ad1464745eaac7f3034048f3eb..b6084a24a80ee30e5f993ee58f0aeef1c21c94c6 100644 (file)
--- a/util/mkisofs/mkisofs.c
+++ b/util/mkisofs/mkisofs.c
@@ -914,7 +914,7 @@ int FDECL2(main, int, argc, char **, argv){
        exit (0);
        break;
       case OPTION_VERSION:
-       printf ("%s (%s %s)\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
+       printf ("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
        exit (0);
        break;
       case OPTION_NOSPLIT_SL_COMPONENT: