Attachment #168632 for bug #240958

View | Details | Raw Unified | Return to bug 240958
Collapse All | Expand All

Lines 1172-1178 Link Here

(-)xscreensaver-5.07_old/configure.in (-1 / +1 lines)
1172	#	1172	#
1173	###############################################################################	1173	###############################################################################
1174		1174
1175	AC_PROG_INTLTOOL	1175	# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
1176	GETTEXT_PACKAGE=xscreensaver	1176	GETTEXT_PACKAGE=xscreensaver
1177	AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",	1177	AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
1178	[This is the name of the gettext package to use.])	1178	[This is the name of the gettext package to use.])




mansuffix	= 1
manNdir		= $(mandir)/man$(mansuffix)

#INTLTOOL_MERGE	= @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958

GTK_DATADIR	= @GTK_DATADIR@
GTK_APPDIR	= $(GTK_DATADIR)/applications


# screensaver-properties.desktop
# into /usr/share/applications/
install-gnome::
	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
	   fi								     ;\
	   name2=xscreensaver-properties.desktop			     ;\
	   echo $(INSTALL_DATA) screensaver-properties.desktop.in		      \
		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
		$(INSTALL_DATA) screensaver-properties.desktop.in		      \
		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
	 fi


# xscreensaver.xpm
# into /usr/share/pixmaps/
install-gnome:: $(LOGO)

XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h

# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958

# The executables linked in this directory.
#

Return to bug 240958

Lines 22-28 Link Here

(-)xscreensaver-5.07_old/driver/Makefile.in (-6 / +5 lines)
22	mansuffix = 1	22	mansuffix = 1
23	manNdir = $(mandir)/man$(mansuffix)	23	manNdir = $(mandir)/man$(mansuffix)
24		24
25	INTLTOOL_MERGE = @INTLTOOL_MERGE@	25	#INTLTOOL_MERGE = @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
26		26
27	GTK_DATADIR = @GTK_DATADIR@	27	GTK_DATADIR = @GTK_DATADIR@
28	GTK_APPDIR = $(GTK_DATADIR)/applications	28	GTK_APPDIR = $(GTK_DATADIR)/applications
Lines 492-511 Link Here
492		492
493	# screensaver-properties.desktop	493	# screensaver-properties.desktop
494	# into /usr/share/applications/	494	# into /usr/share/applications/
495	install-gnome:: screensaver-properties.desktop	495	install-gnome::
496	@if [ "$(GTK_DATADIR)" != "" ]; then \	496	@if [ "$(GTK_DATADIR)" != "" ]; then \
497	if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \	497	if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
498	echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\	498	echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
499	$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\	499	$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
500	fi ;\	500	fi ;\
501	name2=xscreensaver-properties.desktop ;\	501	name2=xscreensaver-properties.desktop ;\
502	echo $(INSTALL_DATA) screensaver-properties.desktop \	502	echo $(INSTALL_DATA) screensaver-properties.desktop.in \
503	$(install_prefix)$(GTK_APPDIR)/$$name2 ;\	503	$(install_prefix)$(GTK_APPDIR)/$$name2 ;\
504	$(INSTALL_DATA) screensaver-properties.desktop \	504	$(INSTALL_DATA) screensaver-properties.desktop.in \
505	$(install_prefix)$(GTK_APPDIR)/$$name2 ;\	505	$(install_prefix)$(GTK_APPDIR)/$$name2 ;\
506	fi	506	fi
507		507
508
509	# xscreensaver.xpm	508	# xscreensaver.xpm
510	# into /usr/share/pixmaps/	509	# into /usr/share/pixmaps/
511	install-gnome:: $(LOGO)	510	install-gnome:: $(LOGO)
Lines 764-770 Link Here
764	XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad	763	XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
765	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h	764	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
766		765
767	@INTLTOOL_DESKTOP_RULE@	766	# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
768		767
769	# The executables linked in this directory.	768	# The executables linked in this directory.
770	#	769	#