Makefile

@@ -3,7 +3,7 @@ TARGET_ALLCAPS = X49GPNG
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 3
-PATCHLEVEL = 1
+PATCHLEVEL = 0
 
 #
 DEBUG_CFLAGS = -g # -pg
@@ -226,12 +226,13 @@ INSTALL_MAN_DIR = "$(INSTALL_PREFIX)/share/man/man1"
 dist/$(TARGET).desktop: dist/$(TARGET).desktop.in
 	perl -p -e "s!TARGET!$(TARGET)!" < dist/$(TARGET).desktop.in >$@
 
-dist/$(TARGET).man: dist/$(TARGET).scd
+dist/$(TARGET).man: dist/$(TARGET).man.in
 	scdoc < dist/$(TARGET).scd >$@
 
 install: all dist/$(TARGET).desktop dist/$(TARGET).man
 	install -D -m 755 dist/$(TARGET) "$(DESTDIR)$(INSTALL_BINARY_DIR)/$(TARGET)"
 	mkdir -p "$(DESTDIR)$(INSTALL_DATA_DIR)/"
+	cp dist/*.png "$(DESTDIR)$(INSTALL_DATA_DIR)/"
 	install -D -m 644 dist/$(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET).desktop"
 	install -D -m 644 dist/$(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET).1"
 	cp -R dist/firmware/ "$(DESTDIR)$(INSTALL_DATA_DIR)/firmware"

src/x49gpng/options.c

@@ -97,11 +97,8 @@ static void print_config( void )
     fprintf( stdout, "-- This is a comment\n" );
 
     fprintf( stdout, "name = \"%s\" -- this customize the title of the window\n", opt.name );
-    fprintf( stdout,
-             "model = \"%s\" -- possible values: \"49gp\", \"50g\". Changes the colors and the bootloader looked for when (re-)flashing\n",
-             opt.model == MODEL_50G ? "50g" : "49gp" );
-    fprintf( stdout, "newrpl_keyboard = %s -- when true this makes the keyboard labels more suited to newRPL use\n",
-             opt.newrpl ? "true" : "false" );
+    fprintf( stdout, "model = \"%s\" -- possible values: \"49gp\", \"50g\". Changes the colors and the bootloader looked for when (re-)flashing\n", opt.model == MODEL_50G ? "50g" : "49gp" );
+    fprintf( stdout, "newrpl_keyboard = %s -- when true this makes the keyboard labels more suited to newRPL use\n", opt.newrpl ? "true" : "false" );
     fprintf( stdout, "font = \"%s\"\n", opt.font );
     fprintf( stdout, "font_size = %i -- integer only\n", opt.font_size );
     fprintf( stdout, "display_scale = %i -- integer only\n", opt.display_scale );
@@ -191,8 +188,7 @@ void config_init( char* progname, int argc, char* argv[] )
                          "                              in the area beyond the firmware\n"
                          " -r --reboot                  reboot on startup instead of continuing from the\n"
                          "                              saved state in the state file\n\n"
-                         "The state file is formatted as INI file and contains the settings for which persistence makes sense like CPU "
-                         "registers, etc.\n"
+                         "The state file is formatted as INI file and contains the settings for which persistence makes sense like CPU registers, etc.\n"
                          "If the state file is omitted, ~/.config/%s/state is used.\n"
                          "Please consult the manual for more details on state file settings.\n",
                          progname, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, progname, DEFAULT_GDBSTUB_PORT, progname );