tMakefiles now install GNOME desktop entry and icons - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 5ea8f28c66b7d3ec785d0779ac9ce41f49754a79
(DIR) parent 244d8190333bf21bdc09b6169001f0bfb55f363e
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Sun, 17 Jun 2001 20:07:20 +0000
Makefiles now install GNOME desktop entry and icons
Diffstat:
M Makefile.am | 10 ++++++----
M Makefile.in | 5 ++++-
M src/Makefile.am | 12 +++++++++---
M src/Makefile.in | 12 +++++++++---
4 files changed, 28 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/Makefile.am b/Makefile.am
t@@ -1,6 +1,7 @@
-SUBDIRS = intl src doc po
-
-DISTFILES = ABOUT-NLS
+SUBDIRS = intl src doc po
+DISTFILES = ABOUT-NLS
+DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
+DESKTOP = dopewars.desktop
install-data-local:
${mkinstalldirs} ${DESTDIR}${datadir}
t@@ -8,4 +9,5 @@ install-data-local:
chown root:games ${DESTDIR}${datadir}/dopewars.sco || \
chown root:wheel ${DESTDIR}${datadir}/dopewars.sco
chmod 0660 ${DESTDIR}${datadir}/dopewars.sco
-
+ ${mkinstalldirs} ${DESKTOPDIR}
+ ${INSTALL} -o root -g 0 -m 0644 ${DESKTOP} ${DESKTOPDIR}
(DIR) diff --git a/Makefile.in b/Makefile.in
t@@ -94,8 +94,9 @@ l = @l@
localedir = @localedir@
SUBDIRS = intl src doc po
-
DISTFILES = ABOUT-NLS
+DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
+DESKTOP = dopewars.desktop
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
t@@ -385,6 +386,8 @@ install-data-local:
chown root:games ${DESTDIR}${datadir}/dopewars.sco || \
chown root:wheel ${DESTDIR}${datadir}/dopewars.sco
chmod 0660 ${DESTDIR}${datadir}/dopewars.sco
+ ${mkinstalldirs} ${DESKTOPDIR}
+ ${INSTALL} -o root -g 0 -m 0644 ${DESKTOP} ${DESKTOPDIR}
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
(DIR) diff --git a/src/Makefile.am b/src/Makefile.am
t@@ -3,14 +3,20 @@ dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c \
curses_client.c gtk_client.c winmain.c \
dopeos.c tstring.c @GTKPORT_C@
dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ @WNDRES@
-INCLUDES = @GTK_CFLAGS@ -I.. -I.
-LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ @WNDRES@
-DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
+INCLUDES = @GTK_CFLAGS@ -I.. -I.
+LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ @WNDRES@
+DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
+PIXDIR = ${DESTDIR}${datadir}/pixmaps
+PIXMAPS = dopewars-pill.png dopewars-shot.png dopewars-weed.png
install-exec-hook:
chown root:games ${DESTDIR}${bindir}/dopewars || \
chown root:wheel ${DESTDIR}${bindir}/dopewars
chmod 2755 ${DESTDIR}${bindir}/dopewars
+install-data-local:
+ ${mkinstalldirs} ${PIXDIR}
+ ${INSTALL} -o root -g 0 -m 0644 ${PIXMAPS} ${PIXDIR}
+
%.res: %.rc
windres -O coff -o $@ $<
(DIR) diff --git a/src/Makefile.in b/src/Makefile.in
t@@ -100,6 +100,8 @@ dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ @WNDRES@
INCLUDES = @GTK_CFLAGS@ -I.. -I.
LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ @WNDRES@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
+PIXDIR = ${DESTDIR}${datadir}/pixmaps
+PIXMAPS = dopewars-pill.png dopewars-shot.png dopewars-weed.png
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
t@@ -279,7 +281,7 @@ install-exec-am: install-binPROGRAMS
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-exec: install-exec-am
-install-data-am:
+install-data-am: install-data-local
install-data: install-data-am
install-am: all-am
t@@ -335,8 +337,8 @@ maintainer-clean-compile tags mostlyclean-tags distclean-tags \
clean-tags maintainer-clean-tags distdir mostlyclean-depend \
distclean-depend clean-depend maintainer-clean-depend info-am info \
dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
t@@ -346,6 +348,10 @@ install-exec-hook:
chown root:wheel ${DESTDIR}${bindir}/dopewars
chmod 2755 ${DESTDIR}${bindir}/dopewars
+install-data-local:
+ ${mkinstalldirs} ${PIXDIR}
+ ${INSTALL} -o root -g 0 -m 0644 ${PIXMAPS} ${PIXDIR}
+
%.res: %.rc
windres -O coff -o $@ $<