Move gutenprint data files to system

build/jam/HaikuImage

@@ -339,11 +339,6 @@ AddDirectoryToHaikuImage home config settings printers Preview
 AddDirectoryToHaikuImage home config settings printers "Save as PDF"
 	: home-config-settings-printers-save-as-pdf.rdef ;
 
-# Gutenprint data files
-CopyDirectoryToHaikuImage common data
-	: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
-	: gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
-
 # dvb channel settings
 CopyDirectoryToHaikuImage home config settings Media
 	: [ FDirName $(HAIKU_TOP) data settings media dvb ]

build/jam/HaikuPackages

@@ -160,6 +160,11 @@ SEARCH on $(postInstallFiles)
 	= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
 AddFilesToPackage boot post_install : $(postInstallFiles) ;
 
+# Gutenprint data files
+CopyDirectoryToPackage data
+	: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
+	: gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
+
 # artwork and sounds
 local logoArtwork =
 	$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"

src/libs/print/libgutenprint/config.h

@@ -3,10 +3,10 @@
 
 /* CUPS data directory. */
 /* Not used in Haiku */
-#define CUPS_DATADIR "/boot/common/data/cups"
+#define CUPS_DATADIR "/system/data/cups"
 
 /* Not used in Haiku */
-#define CUPS_MODELDIR "/boot/common/data/model/gutenprint/5.2/"
+#define CUPS_MODELDIR "/system/data/model/gutenprint/5.2/"
 
 /* */
 /* Not used in Haiku */
@@ -153,7 +153,7 @@
 #define PACKAGE_DATA_DIR "/system/data/gutenprint"
 
 /* */
-#define PACKAGE_LIB_DIR "/boot/common/lib/gutenprint"
+#define PACKAGE_LIB_DIR "/system/lib/gutenprint"
 
 /* */
 #define PACKAGE_LOCALE_DIR "/NOT_USED/locale"
@@ -171,7 +171,7 @@
 #define PACKAGE_VERSION "5.2.7"
 
 /* */
-#define PKGMODULEDIR "/boot/common/lib/gutenprint/5.2/modules"
+#define PKGMODULEDIR "/system/lib/gutenprint/5.2/modules"
 
 /* */
 #define PKGXMLDATADIR "/system/data/gutenprint"