From c9f12a26fe0844b04e035fe01f32c4dd8b86f237 Mon Sep 17 00:00:00 2001 From: pabs Date: Mon, 11 Jun 2007 19:13:16 +0000 Subject: [PATCH] Really really fix 1568925, gawd I suck. This time I tested it, yes I did. YAY NEW PXEGEEK PROVIDED TANGO GOODNESS WITH THE SUGAR LOADED DEBCONF...... git-svn-id: http://svn.voria.com/code@516 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/config/configure.ac | 3 +++ synfig-studio/trunk/images/Makefile.am | 2 -- synfig-studio/trunk/src/gtkmm/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac index d4937ae..567d071 100755 --- a/synfig-studio/trunk/config/configure.ac +++ b/synfig-studio/trunk/config/configure.ac @@ -171,6 +171,9 @@ AC_SUBST(FMOD_LIBS) imageext=png AC_SUBST(imageext) +imagedir="${datadir}/pixmaps" +AC_SUBST(imagedir) + AC_OUTPUT( Makefile synfigstudio.desktop diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index b2b837f..d008494 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -8,8 +8,6 @@ IMAGES=installer_logo.$(EXT) installer_logo_osx.$(EXT) mirror_icon.$(EXT) time_t MAINTAINERCLEANFILES=Makefile.in CLEANFILES=$(IMAGES) images.nsh unimages.nsh installer_logo.bmp sif_icon.ico synfig_icon.ico icons.nsh unicons.nsh -imagedir=@imagedir@ - image_DATA=$(IMAGES) diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am index 90932c8..c84dbd4 100644 --- a/synfig-studio/trunk/src/gtkmm/Makefile.am +++ b/synfig-studio/trunk/src/gtkmm/Makefile.am @@ -51,4 +51,4 @@ bin_PROGRAMS = synfigstudio synfigstudio_SOURCES = $(MOD_MIRROR_CC) $(MOD_MIRROR_HH) $(PALETTE_CC) $(PALETTE_HH) $(WORKAREARENDERER_CC) $(WORKAREARENDERER_HH) $(ACTION_MANAGERS_HH) $(ACTION_MANAGERS_CC) $(DOCK_HH) $(DOCK_CC) $(OTHER_HH) $(OTHER_CC) $(EVENTS_HH) $(EVENTS_CC) $(DUCKTRANSFORM_HH) $(DUCKTRANSFORM_CC) $(TREEVIEW_HH) $(TREEVIEW_CC) $(TREESTORE_HH) $(TREESTORE_CC) $(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(DIALOG_HH) $(DIALOG_CC) $(CELLRENDERER_HH) $(CELLRENDERER_CC) synfigstudio_LDADD = -L../synfigapp -lsynfigapp @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@ synfigstudio_LDFLAGS=-dlopen self -synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(datadir)/share/pixmaps\" -DIMAGE_EXT=\"$(imageext)\" +synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(imagedir)\" -DIMAGE_EXT=\"$(imageext)\" -- 2.7.4