GNOME.org
 

gnome-games r7281 - in trunk: . gnect/data gnect/src gnibbles iagno

Author: andreasr
Date: Sun Jan 27 21:57:10 2008
New Revision: 7281
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7281&view=rev

Log:
Install ggz demons in libexecdir, not bindir. Patch by Christian Persch in bug #510917.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gnect/data/Makefile.am
   trunk/gnect/data/gnect-client.dsc.in
   trunk/gnect/data/gnect-server.dsc.in
   trunk/gnect/src/Makefile.am
   trunk/gnibbles/Makefile.am
   trunk/gnibbles/gnibbles-client.dsc.in
   trunk/gnibbles/gnibbles-server.dsc.in
   trunk/iagno/Makefile.am
   trunk/iagno/iagno-client.dsc.in
   trunk/iagno/iagno-server.dsc.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 27 21:57:10 2008
@@ -148,6 +148,7 @@
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_LN_S
+AC_PROG_SED
 
 # Run these before AC_PROG_LIBTOOL, else it bugs
 AC_GGZ_INIT
@@ -512,6 +513,9 @@
 AM_CONDITIONAL([GGZ_CLIENT], [test "$have_ggz" = "yes"])
 AM_CONDITIONAL([WITH_INCLUDED_GGZ],[test "$have_ggz" = "yes"])
 
+GNOME_GAMES_GGZ_DSC_RULE='%.dsc:   %.dsc.in   ; $(SED) -e "s|[ ]VERSION[@]|$(VERSION)|g" -e "s|[ ]libexecdir[@]|$(libexecdir)|g" -e "s|[ ]bindir[@]|$(bindir)|g" -e "s|[ ]ggzexecmoddir[@]|$(ggzexecmoddir)|g"< $< > $[ ]'
+AC_SUBST([GNOME_GAMES_GGZ_DSC_RULE])
+
 # ********
 
 GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
@@ -804,8 +808,6 @@
 gnect/Makefile
 gnect/src/Makefile
 gnect/data/Makefile
-gnect/data/gnect-client.dsc
-gnect/data/gnect-server.dsc
 gnect/pixmaps/Makefile
 gnect/help/Makefile
 gnomine/Makefile
@@ -819,8 +821,6 @@
 gtali/help/Makefile
 gtali/help/da/Makefile
 iagno/Makefile
-iagno/iagno-client.dsc
-iagno/iagno-server.dsc
 iagno/help/Makefile
 gnotravex/Makefile
 gnotravex/gnotravex.desktop.in
@@ -839,8 +839,6 @@
 gnobots2/help/da/Makefile
 gnobots2/help/it/Makefile
 gnibbles/Makefile
-gnibbles/gnibbles-client.dsc
-gnibbles/gnibbles-server.dsc
 gnibbles/help/Makefile
 gnibbles/pix/Makefile
 aisleriot/Makefile

Modified: trunk/gnect/data/Makefile.am
==============================================================================
--- trunk/gnect/data/Makefile.am	(original)
+++ trunk/gnect/data/Makefile.am	Sun Jan 27 21:57:10 2008
@@ -4,12 +4,24 @@
 Games_in_files = gnect.desktop.in.in
 Gamesdir       = $(datadir)/applications
 Games_DATA     = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnect.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
+
+if GGZ_SERVER
+ggzroom_in_files = gnect.room.in
+ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
+ggzroomdir = ${prefix}/etc/ggzd/rooms/
+
+ggzserver_dscdir = ${prefix}/etc/ggzd/games/
+ggzserver_dsc_in_files = gnect-server.dsc.in
+ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
+endif # GGZ_SERVER
+
+if GGZ_CLIENT
+ggzclient_dsc_in_files = gnect-client.dsc.in
+endif # GGZ_CLIENT
 
 EXTRA_DIST = gnect-client.dsc.in \
 	     gnect-server.dsc.in \
@@ -17,28 +29,23 @@
 	     $(velena_DATA) \
              $(schema_in_files)
 
-CLEANFILES = $(ggzroom_DATA)
+CLEANFILES = $(ggzroom_DATA) $(ggzclient_dsc_in_files:.dsc.in=.dsc)
 DISTCLEANFILES = $(schema_DATA) $(Games_DATA)
 
-install-data-local:
+install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
 if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnect/data/$(schema_DATA)
 endif
 if GGZ_CLIENT
 	$(GGZ_CONFIG) -D --install --modfile=gnect-client.dsc --force
 endif
+
 uninstall-local:
 if GGZ_CLIENT
 	-$(GGZ_CONFIG) -D --remove --modfile=gnect-client.dsc
 endif
 
-
-if GGZ_SERVER
-ggzroom_in_files = gnect.room.in
-ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_SCHEMAS_RULE@
 @GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
-
-ggzgame_DATA = gnect-server.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
-endif
+ GNOME_GAMES_GGZ_DSC_RULE@

Modified: trunk/gnect/data/gnect-client.dsc.in
==============================================================================
--- trunk/gnect/data/gnect-client.dsc.in	(original)
+++ trunk/gnect/data/gnect-client.dsc.in	Sun Jan 27 21:57:10 2008
@@ -1,7 +1,7 @@
 [ModuleInfo]
 Name = Gnect
 Author = The GNOME Project 
-CommandLine = @prefix@/bin/gnect
+CommandLine = @bindir@/gnect
 Frontend = gtk
 Homepage = http://www.gnome.org/projects/gnome-games/
 ProtocolEngine = Gnect 

Modified: trunk/gnect/data/gnect-server.dsc.in
==============================================================================
--- trunk/gnect/data/gnect-server.dsc.in	(original)
+++ trunk/gnect/data/gnect-server.dsc.in	Sun Jan 27 21:57:10 2008
@@ -3,10 +3,10 @@
 Description = Place four tiles in a row.
 Homepage = http://www.gnome.org/projects/gnome-games/ 
 Name = Gnect
-Version = @VERSION@ 
+Version = @VERSION@
 
 [LaunchInfo]
-ExecutablePath = @prefix@/bin/gnectd 
+ExecutablePath = @ggzexecmoddir@/gnectd
 # Set ExecutableArgs in the room file
 
 [Protocol]

Modified: trunk/gnect/src/Makefile.am
==============================================================================
--- trunk/gnect/src/Makefile.am	(original)
+++ trunk/gnect/src/Makefile.am	Sun Jan 27 21:57:10 2008
@@ -1,5 +1,8 @@
+bin_PROGRAMS = gnect
+ggzexecmod_PROGRAMS =
+
 if GGZ_SERVER
-bin_PROGRAMS = gnect gnectd
+ggzexecmod_PROGRAMS += gnectd
 gnectd_SOURCES = server.h   \
 		 server.c   \
 		 main.h	    \
@@ -18,15 +21,11 @@
                  proto.h    \
                  rules.h    
 
-gnectd_LDFLAGS = @GGZDMOD_LDFLAGS@
-
 gnectd_LDADD = \
-	../../libgames-support/libgames-support.la         \
+	$(top_builddir)/libgames-support/libgames-support.la         \
 	$(GNOME_GAMES_LIBS)     \
 	$(INTLLIBS) 		\
-	@LIB_GGZDMOD@
-else
-bin_PROGRAMS = gnect 
+	$(LIB_GGZDMOD)
 endif
 
 if GGZ_CLIENT
@@ -70,11 +69,9 @@
 	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
 	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES)
 
-gnect_LDFLAGS = $(GGZMOD_LDFLAGS)
 gnect_LDADD = \
 	../../libgames-support/libgames-support.la         \
 	$(GNOME_GAMES_LIBS)     \
 	$(INTLLIBS) \
 	$(LIB_GGZMOD) \
 	$(LIB_GGZ_GTK)
-

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Sun Jan 27 21:57:10 2008
@@ -1,4 +1,5 @@
 bin_PROGRAMS = gnibbles
+ggzexecmod_PROGRAMS =
 
 gnibbles_SOURCES = \
 	bonus.h \
@@ -57,8 +58,6 @@
 gnibbles_LDADD += \
 	$(LIB_GGZMOD) \
 	$(LIB_GGZ_GTK)
-
-gnibbles_LDFLAGS += $(GGZMOD_LDFLAGS)
 endif
 
 pixmapdir = $(datadir)/pixmaps/gnibbles
@@ -97,15 +96,13 @@
 desktopdir=$(datadir)/applications
 desktop_in_files = gnibbles.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnibbles.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
 
 if GGZ_SERVER
-bin_PROGRAMS += gnibblesd
+ggzexecmod_PROGRAMS += gnibblesd
 
 gnibblesd_SOURCES = \
 	server.h \
@@ -124,7 +121,7 @@
 	$(GNOME_GAMES_CFLAGS)			\
 	$(AM_CFLAGS)
 
-gnibblesd_LDFLAGS = $(AM_LDFLAGS) $(GGZDMOD_LDFLAGS)
+gnibblesd_LDFLAGS = $(AM_LDFLAGS)
 
 gnibblesd_LDADD = \
 	$(GNOME_GAMES_LIBS)     \
@@ -134,13 +131,16 @@
 ggzroom_in_files = gnibbles.room.in
 ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
 ggzroomdir = ${prefix}/etc/ggzd/rooms/
- GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
-
-ggzgame_DATA = gnibbles-server.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
 
+ggzserver_dscdir = ${prefix}/etc/ggzd/games/
+ggzserver_dsc_in_files = gnibbles-server.dsc.in
+ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
 endif # GGZ_SERVER
 
+if GGZ_CLIENT
+ggzclient_dsc_in_files = gnibbles-client.dsc.in
+endif # GGZ_CLIENT
+
 EXTRA_DIST = \
 	$(pixmap_DATA) 	\
 	$(config_DATA) \
@@ -151,20 +151,19 @@
 
 SUBDIRS= help pix
 
-CLEANFILES = $(ggzroom_DATA)
+CLEANFILES = $(ggzroom_DATA) $(ggzclient_dsc_in_files:.dsc.in=.dsc)
 
 DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
 
 SCOREFILES = 4.0 3.0 2.0 1.0 4.1 3.1 2.1 1.1
 
-install-data-local:
+install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
 if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnibbles/$(schema_DATA)
 endif
 if GGZ_CLIENT
 	$(GGZ_CONFIG) -D --install --modfile=gnibbles-client.dsc --force
 endif
-
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-for i in ${SCOREFILES} ; do \
 	   touch $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
@@ -172,7 +171,13 @@
 	   chmod 664 $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
 	 done
 	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnibbles && chmod 2555 $(DESTDIR)$(bindir)/gnibbles ; fi
+
 uninstall-local:
 if GGZ_CLIENT
 	-$(GGZ_CONFIG) -D --remove --modfile=gnibbles-client.dsc
 endif
+
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_SCHEMAS_RULE@
+ GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
+ GNOME_GAMES_GGZ_DSC_RULE@

Modified: trunk/gnibbles/gnibbles-client.dsc.in
==============================================================================
--- trunk/gnibbles/gnibbles-client.dsc.in	(original)
+++ trunk/gnibbles/gnibbles-client.dsc.in	Sun Jan 27 21:57:10 2008
@@ -2,7 +2,7 @@
 [ModuleInfo]
 Name = Gnibbles 
 Author = The GNOME Project 
-CommandLine = @prefix@/bin/gnibbles
+CommandLine = @bindir@/gnibbles
 Frontend = gtk
 Homepage = http://www.gnome.org/projects/gnome-games/
 ProtocolEngine = Gnibbles 

Modified: trunk/gnibbles/gnibbles-server.dsc.in
==============================================================================
--- trunk/gnibbles/gnibbles-server.dsc.in	(original)
+++ trunk/gnibbles/gnibbles-server.dsc.in	Sun Jan 27 21:57:10 2008
@@ -3,10 +3,10 @@
 Description = Gnibbles is a worms game for GNOME.
 Homepage = http://www.gnome.org/projects/gnome-games/ 
 Name = Gnibbles
-Version = @VERSION@ 
+Version = @VERSION@
 
 [LaunchInfo]
-ExecutablePath = @prefix@/bin/gnibblesd 
+ExecutablePath = @ggzexecmoddir@/gnibblesd
 # Set ExecutableArgs in the room file
 
 [Protocol]

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Sun Jan 27 21:57:10 2008
@@ -12,20 +12,18 @@
 	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
 	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
 
+bin_PROGRAMS = iagno
+ggzexecmod_PROGRAMS =
+
 if GGZ_SERVER
-bin_PROGRAMS = iagno iagnod
+ggzexecmod_PROGRAMS += iagnod
 iagnod_SOURCES = server.h   \
 		 server.c   
 
-iagnod_LDFLAGS = @GGZDMOD_LDFLAGS@
-
 iagnod_LDADD = \
 	$(GNOME_GAMES_LIBS)     \
 	$(INTLLIBS) 		\
-	@LIB_GGZDMOD@
-
-else
-bin_PROGRAMS = iagno 
+	$(LIB_GGZDMOD)
 endif
 
 if GGZ_CLIENT
@@ -43,10 +41,8 @@
 	properties.h \
 	$(GGZ_FILES)
 
-iagno_LDFLAGS = $(GGZMOD_LDFLAGS)
-
 iagno_LDADD = \
-	../libgames-support/libgames-support.la \
+	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GNOME_GAMES_LIBS) \
 	$(INTLLIBS) \
 	$(LIB_GGZMOD) \
@@ -58,36 +54,25 @@
 
 Games_in_files = iagno.desktop.in.in
 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = iagno.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/iagno/$(schema_DATA)
-endif
-if GGZ_CLIENT
-	$(GGZ_CONFIG) -D --install --modfile=iagno-client.dsc --force
-endif
-uninstall-local:
-if GGZ_CLIENT
-	-$(GGZ_CONFIG) -D --remove --modfile=iagno-client.dsc
-endif
-
- INTLTOOL_SOUNDLIST_RULE@
 
 if GGZ_SERVER
 ggzroom_in_files = iagno.room.in
 ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
 ggzroomdir = ${prefix}/etc/ggzd/rooms/
- GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
 
-ggzgame_DATA = iagno-server.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
-endif
+ggzserver_dscdir = ${prefix}/etc/ggzd/games/
+ggzserver_dsc_in_files = iagno-server.dsc.in
+ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
+endif # GGZ_SERVER
+
+if GGZ_CLIENT
+ggzclient_dsc_in_files = iagno-client.dsc.in
+endif # GGZ_CLIENT
 
 EXTRA_DIST = \
 	AUTHORS \
@@ -97,5 +82,23 @@
 	$(pixmap_DATA)	\
 	$(schema_in_files)
 
-CLEANFILES = $(ggzroom_DATA)
-DISTCLEANFILES = $(Games_DATA) $(schema_DATA) 
+CLEANFILES = $(ggzroom_DATA) $(ggzclient_dsc_in_files:.dsc.in=.dsc)
+DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
+
+install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
+if GCONF_SCHEMAS_INSTALL
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/iagno/$(schema_DATA)
+endif
+if GGZ_CLIENT
+	$(GGZ_CONFIG) -D --install --modfile=iagno-client.dsc --force
+endif
+uninstall-local:
+if GGZ_CLIENT
+	-$(GGZ_CONFIG) -D --remove --modfile=iagno-client.dsc
+endif
+
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_SCHEMAS_RULE@
+ INTLTOOL_SOUNDLIST_RULE@
+ GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
+ GNOME_GAMES_GGZ_DSC_RULE@

Modified: trunk/iagno/iagno-client.dsc.in
==============================================================================
--- trunk/iagno/iagno-client.dsc.in	(original)
+++ trunk/iagno/iagno-client.dsc.in	Sun Jan 27 21:57:10 2008
@@ -2,7 +2,7 @@
 [ModuleInfo]
 Name = Iagno
 Author = The GNOME Project 
-CommandLine = @prefix@/bin/iagno
+CommandLine = @bindir@/iagno
 Frontend = gtk
 Homepage = http://www.gnome.org/projects/gnome-games/
 ProtocolEngine = Iagno 

Modified: trunk/iagno/iagno-server.dsc.in
==============================================================================
--- trunk/iagno/iagno-server.dsc.in	(original)
+++ trunk/iagno/iagno-server.dsc.in	Sun Jan 27 21:57:10 2008
@@ -3,10 +3,10 @@
 Description = The GNOME version of Reversi.
 Homepage = http://www.gnome.org/projects/gnome-games/ 
 Name = Iagno
-Version = @VERSION@ 
+Version = @VERSION@
 
 [LaunchInfo]
-ExecutablePath = @prefix@/bin/iagnod 
+ExecutablePath = @ggzexecmoddir@/iagnod
 # Set ExecutableArgs in the room file
 
 [Protocol]
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]