blob: b579fa8966ee200aa8cea8b4372bf792ad55fb4d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
$NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $
--- driver/Makefile.in.orig 2005-03-21 16:18:18.000000000 +0900
+++ driver/Makefile.in 2005-04-20 17:28:14.000000000 +0900
@@ -222,7 +222,7 @@
xscreensaver.h prefs.h remote.h \
demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
demo-Gtk-conf.h
-MEN_1 = xscreensaver.man xscreensaver-demo.man \
+MEN_1 = xscreensaver.man \
xscreensaver-command.man \
xscreensaver-text.man \
xscreensaver-getimage.man \
@@ -288,7 +288,7 @@
fi ; \
echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \
$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
- @for exe in xscreensaver-command xscreensaver-demo \
+ @for exe in xscreensaver-command \
xscreensaver-getimage @EXES_OSX@ ; do \
echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
$(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
@@ -464,7 +464,7 @@
# screensaver-properties.desktop
# into /usr/share/applications/
-install-gnome:: screensaver-properties.desktop
+xxxinstall-gnome:: screensaver-properties.desktop
@if [ "$(GTK_DATADIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
@@ -496,7 +496,7 @@
# ../utils/images/screensaver-*.png
# into /usr/share/xscreensaver/glade/
install-gnome::
- @if [ "$(GTK_GLADEDIR)" != "" ]; then \
+ @if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
@@ -513,7 +513,7 @@
# xscreensaver-demo.glade2
# into /usr/share/xscreensaver/glade/
install-gnome:: xscreensaver-demo.glade2
- @if [ "$(GTK_GLADEDIR)" != "" ]; then \
+ @if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
|
