blob: 1d08ed819c555a5d696228a8a24769921f1d0f93 (
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
50
51
52
53
54
55
56
57
58
|
$NetBSD: patch-aa,v 1.7 2000/07/10 20:19:28 tron Exp $
--- driver/Makefile.in.orig Mon Apr 3 11:04:08 2000
+++ driver/Makefile.in Mon Jul 10 22:05:33 2000
@@ -140,8 +140,8 @@
DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS)
DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS)
-SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \
- $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
+SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) -lXt \
+ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \
$(PASSWD_LIBS)
CMD_LIBS = $(LIBS) $(X_LIBS) \
@@ -325,30 +325,30 @@
install-gnome: screensaver-properties.desktop
@if [ "$(GNOME_DATADIR)" != "" ]; then \
echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \
- $(GNOME_CCDIR)/screensaver-properties.desktop ; \
+ $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \
$(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \
- $(GNOME_CCDIR)/screensaver-properties.desktop ; \
+ $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \
echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \
- $(GNOME_PANELDIR)/screensaver-properties.desktop ; \
+ $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \
$(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \
- $(GNOME_PANELDIR)/screensaver-properties.desktop ; \
+ $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \
fi
uninstall-gnome:
@if [ "$(GNOME_DATADIR)" != "" ]; then \
- echo rm -f $(GNOME_CCDIR)/screensaver-properties.desktop ; \
- rm -f $(GNOME_CCDIR)/screensaver-properties.desktop ; \
- echo rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop ; \
- rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop ; \
+ echo rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \
+ rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \
+ echo rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \
+ rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \
fi
install-kde:
@src="$(srcdir)/xscreensaver.kss" ; \
- if [ "$$KDEDIR" != "" ]; then \
- dir="$(install_prefix)$$KDEDIR/bin" ; \
+ if true; then \
+ dir="$(bindir)" ; \
dest="$$dir/xscreensaver.kss" ; \
- echo $(INSTALL_PROGRAM) $$src $$dest ; \
- if $(INSTALL_PROGRAM) $$src $$dest ; then \
+ echo $(BSD_INSTALL_SCRIPT) $$src $$dest ; \
+ if $(BSD_INSTALL_SCRIPT) $$src $$dest ; then \
true ; \
else \
e=echo ; \
|
