From: phantomjinx <pha...@us...> - 2010-07-07 21:22:20
|
commit 2410f7c9008c291e136a9617ae8c65f23e4bd697 Author: phantomjinx <p.g...@ph...> Date: Sat Jul 3 15:40:06 2010 +0100 Odd fixes for installation .gitignore | 23 +++++++++++++++++++++++ INSTALL | 8 +++++--- INSTALL_GIT | 1 + Makefile.am | 7 +------ 4 files changed, 30 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index 2b999d8..bf77d48 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,26 @@ cscope.out # /plugins/ /plugins/*.plugin + +# links from dev env +details_editor.glade +coverweb.glade +exporter.glade +info_display.glade +sorttab_display.glade +track_display.glade +repository_editor.glade +cover_display.glade +playlist_display.glade +core_prefs.xml + +details_editor.ui +coverweb.ui +exporter.ui +info_display.ui +sorttab_display.ui +track_display.ui +repository_editor.ui +cover_display.ui +playlist_display.ui +core_prefs.ui diff --git a/INSTALL b/INSTALL index ad20c7b..6becc7f 100644 --- a/INSTALL +++ b/INSTALL @@ -44,7 +44,8 @@ How to compile/install gtkpod: libgpod (at least 0.6.1) libid3tag (at least 0.15) perl XML::Parser module - pkgconfig + anjuta (at least 2.30) + pkgconfig Optional packages: @@ -88,8 +89,8 @@ How to compile/install gtkpod: 5. Install the gtkpod software (may require root privileges): - make install - + make install && ldconfig + Note: You can test gtkpod without installing it. Some features (translation catalogues, icons, scripts) may not be available, @@ -145,6 +146,7 @@ cd libgpod/ ./autogen.sh make sudo make install +sudo ldconfig #start gtkpod gtkpod & diff --git a/INSTALL_GIT b/INSTALL_GIT index 36f36d6..fce892c 100644 --- a/INSTALL_GIT +++ b/INSTALL_GIT @@ -3,5 +3,6 @@ If you install from git, call ./autogen.sh make make install +ldconfig See the INSTALL and TROUBLESHOOTING file for more information. diff --git a/Makefile.am b/Makefile.am index 029c6db..72efbe2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,12 +20,7 @@ DISTCLEANFILES = \ intltool-update uninstall-hook: - -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data/ui - -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data/glade - -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data/icons - -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data - -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scripts - -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir) + -rm -rf $(DESTDIR)$(pkgdatadir) update-docs: cd doc && make update-docs |