diff options
| -rw-r--r-- | resources/swatches/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | scribus/colorsetmanager.cpp | 4 | ||||
| -rw-r--r-- | scribus/doc/en/color2.html | 2 | ||||
| -rw-r--r-- | scribus/doc/it/color2.html | 2 | ||||
| -rw-r--r-- | scribus/prefsmanager.cpp | 2 | ||||
| -rw-r--r-- | scribus/profiles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | scribus/scribuscore.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/resources/swatches/CMakeLists.txt b/resources/swatches/CMakeLists.txt index e841c72..88b6691 100644 --- a/resources/swatches/CMakeLists.txt +++ b/resources/swatches/CMakeLists.txt @@ -11,5 +11,5 @@ FILE( GLOB RTF_LICENSES *.rtf ) SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt") INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES} - DESTINATION ${LIBDIR}swatches + DESTINATION ${SHAREDIR}swatches ) diff --git a/scribus/colorsetmanager.cpp b/scribus/colorsetmanager.cpp index a2744c1..40d64bd 100644 --- a/scribus/colorsetmanager.cpp +++ b/scribus/colorsetmanager.cpp @@ -29,7 +29,7 @@ ColorSetManager::~ColorSetManager() void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs) { - QString pfadC = ScPaths::instance().libDir()+"swatches/"; + QString pfadC = ScPaths::instance().shareDir()+"swatches/"; QString pfadC2 = pfadC + "Scribus_Basic.xml"; QFile fiC(pfadC2); if (!fiC.exists()) @@ -113,7 +113,7 @@ void ColorSetManager::findPaletteLocations() { paletteLocations.clear(); QStringList locations=ScPaths::instance().getSystemCreateSwatchesDirs(); - locations << ScPaths::instance().libDir()+"swatches/"; + locations << ScPaths::instance().shareDir()+"swatches/"; locations << ScPaths::getApplicationDataDir() + "swatches/locked/"; locations << ScPaths::getApplicationDataDir() + "swatches/"; for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) diff --git a/scribus/doc/en/color2.html b/scribus/doc/en/color2.html index 8422bbf..07669ca 100644 --- a/scribus/doc/en/color2.html +++ b/scribus/doc/en/color2.html @@ -22,7 +22,7 @@ <h4>Linux/UNIX</h4> <p>If you have installed Scribus with a package management system like RPM, DEB or BSD Ports, the palette files need to be copied to either <code>/usr/lib/scribus/swatches</code> or <code>/usr/local/lib/scribus/swatches</code>. The respective location depends on the configuration of a distribution’s package manager.</p> -<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/lib/scribus/swatches</code>.</p> +<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/share/scribus/swatches</code>.</p> <p>If you don’t have root permissions, you can also copy the files to <code>/home/user_name/.scribus/swatches/locked</code>.</p> <p>You have to create the folder <code>locked</code> if doesn’t exist.</p> <h4>Mac OS X</h4> diff --git a/scribus/doc/it/color2.html b/scribus/doc/it/color2.html index c15764f..9458db3 100644 --- a/scribus/doc/it/color2.html +++ b/scribus/doc/it/color2.html @@ -21,7 +21,7 @@ <h4>Linux/UNIX:</h4> <p>Se avete installato Scribus per mezzo di un sistema di gestione dei pacchetti come RPM, DEB o BSD Ports, i file delle raccolte devono essere copiati in <code>/usr/lib/scribus/swatches</code> o <code>/usr/local/lib/scribus/swatches</code>. L'esatta posizione dipende dalla configurazione del gestore di pacchetti di ciascuna distribuzione.</p> -<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/lib/scribus/swatches</code>.</p> +<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/share/scribus/swatches</code>.</p> <p>Se non avete permessi di root, potete anche copiare i file in <code>/home/user_name/.scribus/swatches/locked</code>.</p> <p>Se la cartella <code>locked</code> non esiste, dovrete crearla.</p> <h4>Mac OS X</h4> diff --git a/scribus/prefsmanager.cpp b/scribus/prefsmanager.cpp index 7d5e02b..f8e9bc7 100644 --- a/scribus/prefsmanager.cpp +++ b/scribus/prefsmanager.cpp @@ -142,7 +142,7 @@ void PrefsManager::initDefaults() csm.findPaletteLocations(); csm.findPalettes(); /* - QString pfadC = ScPaths::instance().libDir()+"swatches/"; + QString pfadC = ScPaths::instance().shareDir()+"swatches/"; QString pfadC2 = pfadC + "Scribus_X11.txt"; QFile fiC(pfadC2); if (!fiC.exists()) diff --git a/scribus/profiles/CMakeLists.txt b/scribus/profiles/CMakeLists.txt index e53b253..3fe9614 100644 --- a/scribus/profiles/CMakeLists.txt +++ b/scribus/profiles/CMakeLists.txt @@ -8,5 +8,5 @@ GenericCMYK.txt Readme sRGB.icm srgb.license - DESTINATION ${LIBDIR}profiles + DESTINATION ${SHAREDIR}profiles ) diff --git a/scribus/scribuscore.cpp b/scribus/scribuscore.cpp index 83fbb65..8d14abd 100644 --- a/scribus/scribuscore.cpp +++ b/scribus/scribuscore.cpp @@ -332,7 +332,7 @@ void ScribusCore::getCMSProfiles(bool showInfo) PrinterProfiles.clear(); InputProfiles.clear(); InputProfilesCMYK.clear(); - QString pfad = ScPaths::instance().libDir(); + QString pfad = ScPaths::instance().shareDir(); pfad += "profiles/"; profDirs = ScPaths::getSystemProfilesDirs(); profDirs.prepend( prefsManager->appPrefs.ProfileDir ); |