blob: faf6df445619162702df19d2c7ed2f4d23f927cf (
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
|
--- driver/Makefile.in.orig Tue Jul 22 00:19:10 2003
+++ driver/Makefile.in Tue Jul 22 00:26:47 2003
@@ -24,14 +24,14 @@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
GNOME_DATADIR = @GNOME_DATADIR@
-GNOME_CCDIR_1 = $(GNOME_DATADIR)/control-center/Desktop
-GNOME_CCDIR_2 = $(GNOME_DATADIR)/control-center/capplets
-GNOME_CCDIR_3 = $(GNOME_DATADIR)/control-center-2.0/capplets
+GNOME_CCDIR_1 = $(GNOME_DATADIR)/gnome/control-center/Desktop
+GNOME_CCDIR_2 = $(GNOME_DATADIR)/gnome/control-center/capplets
+GNOME_CCDIR_3 = $(GNOME_DATADIR)/gnome/control-center-2.0/capplets
GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
-GNOME_PANELDIR2 = $(GNOME_DATADIR)/applications
+GNOME_PANELDIR2 = $(GNOME_DATADIR)/gnome/applications
GNOME_PANELDIR = @GNOME_PANELDIR@
GLADE_DATADIR = @GLADE_DATADIR@
-GNOME_ICONDIR = $(GNOME_DATADIR)/pixmaps
+GNOME_ICONDIR = $(GNOME_DATADIR)/gnome/pixmaps
GNOME_BINDIR = $(bindir)
HACK_CONF_DIR = @HACK_CONF_DIR@
@@ -239,7 +239,7 @@
tests: $(TEST_EXES)
install: install-program install-ad install-scripts \
- install-gnome install-kde install-man @INSTALL_PAM@
+ install-gnome install-man @INSTALL_PAM@
uninstall: uninstall-program uninstall-ad \
uninstall-gnome uninstall-kde uninstall-man
@@ -478,8 +478,11 @@
\
echo $(INSTALL_DATA) screensaver-properties.desktop \
$(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
+ /usr/bin/sed 's|xscreensaver-demo.*|screensaver-properties-capplet|'\
+ screensaver-properties.desktop > \
+ screensaver-properties.desktop1 ;\
\
- if $(INSTALL_DATA) screensaver-properties.desktop \
+ if $(INSTALL_DATA) screensaver-properties.desktop1 \
$(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
then true ;\
else \
|
