diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 14:20:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 14:20:57 -0600 |
| commit | ad2f8c5183e73845025775d058b92507bc04f0d5 (patch) | |
| tree | 5d56eb16e574a01445c2e16d44975c7729b02280 | |
| parent | 0067c3fe9dacaaa07c4cbddb51a516e943ebd940 (diff) | |
| download | soundkonverter-ad2f8c5183e73845025775d058b92507bc04f0d5.tar.gz soundkonverter-ad2f8c5183e73845025775d058b92507bc04f0d5.zip | |
Fix prior commit
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rwxr-xr-x | src/amarotdescript/Makefile.am | 4 | ||||
| -rwxr-xr-x | src/config.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 5b23570..2ce1597 100644 --- a/configure.in +++ b/configure.in @@ -213,7 +213,7 @@ AC_CONFIG_FILES([ doc/Makefile ]) AC_CONFIG_FILES([ doc/en/Makefile ]) AC_CONFIG_FILES([ po/Makefile ]) AC_CONFIG_FILES([ src/Makefile ]) -AC_CONFIG_FILES([ src/amarotdescript/Makefile ]) +AC_CONFIG_FILES([ src/amarokscript/Makefile ]) AC_CONFIG_FILES([ src/metadata/Makefile ]) AC_CONFIG_FILES([ src/metadata/aac/Makefile ]) AC_CONFIG_FILES([ src/metadata/ape/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index afbee85..1ff2880 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,13 +46,13 @@ xdg_apps_DATA = soundkonverter.desktop shellrcdir = $(kde_datadir)/soundkonverter shellrc_DATA = soundkonverterui.rc -SUBDIRS = amarotdescript metadata pics pluginloader plugins +SUBDIRS = amarokscript metadata pics pluginloader plugins soundkonverter_DEPENDENCIES = metadata/libmetadata.la \ pluginloader/libpluginloader.la -amarotdescriptsdir = $(kde_datadir)/amarok/scripts +amarokscriptsdir = $(kde_datadir)/amarok/scripts servicemenusdir = $(kde_datadir)/konqueror/servicemenus servicemenus_DATA = audiocd_extract_with_soundkonverter.desktop -amarotdescriptdir = $(kde_datadir)/soundkonverter/amarotdescript +amarokscriptdir = $(kde_datadir)/soundkonverter/amarokscript bin_SCRIPTS = userscript.sh userscriptdir = $(kde_datadir)/soundkonverter userscript_SCRIPTS = userscript.sh diff --git a/src/amarotdescript/Makefile.am b/src/amarotdescript/Makefile.am index 7797a6e..b8049a7 100755 --- a/src/amarotdescript/Makefile.am +++ b/src/amarotdescript/Makefile.am @@ -1,3 +1,3 @@ -amarotdescriptdir = $(kde_datadir)/soundkonverter/amarotdescript -amarotdescript_DATA = README \ +amarokscriptdir = $(kde_datadir)/soundkonverter/amarokscript +amarokscript_DATA = README \ soundKonverter.rb diff --git a/src/config.cpp b/src/config.cpp index bc635b8..4ec463b 100755 --- a/src/config.cpp +++ b/src/config.cpp @@ -640,10 +640,10 @@ void Config::writeAmarokScript() KStandardDirs* stdDirs = new KStandardDirs(); if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb")) ) { - TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarotdescript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true ); + TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true ); } if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/README")) ) { - TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarotdescript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true ); + TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true ); } delete stdDirs; } |