diff options
| author | jstebbins <[email protected]> | 2009-08-24 17:32:22 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-08-24 17:32:22 +0000 |
| commit | 2752e26db58d8304e3ddb03a9b95c4f9af7bf5fa (patch) | |
| tree | 20bcb6484190356bc65bd0448cd4ca3f7f36ba80 /gtk | |
| parent | 9e43a26a870845acafbeff92f62db3609c48e37c (diff) | |
build system: some changes that simplify things for packaging tools
- Add DESTDIR to install path for HandBrakeCLI
- Modify linux packaging rules for deb and rpm packages to use DESTDIR
- lingui: only update icon cache during install if DESTDIR is not set
- patch out the hardcoded install path for m4 macros in libdvdread and libdvdnav
when uid==0
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2774 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/ghb.spec | 2 | ||||
| -rw-r--r-- | gtk/src/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk/ghb.spec b/gtk/ghb.spec index f39d4fcd5..5b838531c 100644 --- a/gtk/ghb.spec +++ b/gtk/ghb.spec @@ -50,7 +50,7 @@ transcoder, available for MacOS X, Linux and Windows. %install #rm -rf $RPM_BUILD_ROOT # I don't want to rebuild the world, so just install what I've prebuilt -make -C $RPM_BUILD_ROOT/../.. PREFIX=$RPM_BUILD_ROOT/usr PREFIX/=$RPM_BUILD_ROOT/usr/ install +make -C $RPM_BUILD_ROOT/../.. DESTDIR=$RPM_BUILD_ROOT install ## blow away stuff we don't want /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am index 5dbecd50a..52be4d1c2 100644 --- a/gtk/src/Makefile.am +++ b/gtk/src/Makefile.am @@ -149,7 +149,7 @@ uninstall-local: fi; \ rm -f $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \ done - @-if test -d "$(DESTDIR)/$(datadir)"; then \ + @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ else \ @@ -171,7 +171,7 @@ install-data-local: mkdir -p $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/; \ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \ done - @-if test -d "$(DESTDIR)/$(datadir)"; then \ + @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ else \ |