summaryrefslogtreecommitdiff
path: root/x11/xscreensaver/patches/patch-ad
blob: 8e4ac0ad066857fa4c5b20606577abba13eb7f12 (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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
$NetBSD: patch-ad,v 1.9 2003/11/14 15:05:09 fredb Exp $

--- driver/Makefile.in.orig	2003-09-07 19:00:00.000000000 -0500
+++ driver/Makefile.in
@@ -16,7 +16,7 @@ exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 #datadir	= @datadir@
 datadir		= $(GNOME_DATADIR)
-localedir	= $(datadir)/locale
+localedir	= /usr/X11R6/share/locale
 mandir		= @mandir@
 mansuffix	= 1
 manNdir		= $(mandir)/man$(mansuffix)
@@ -39,7 +39,7 @@ CC		= @CC@
 CFLAGS		= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
 DEFS		= @DEFS@
-INTL_DEFS	= -DLOCALEDIR=\"$(localedir)\"
+INTL_DEFS	= -DLOCALEDIR="\"/usr/X11R6/share/locale\""
 SUBP_DEFS	= $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
 GTK_DEFS	= $(DEFS) -DDEFAULT_ICONDIR='"$(GLADE_DATADIR)"'
 CONF_DEFS	= -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"'
@@ -456,7 +456,7 @@ install-pam:
 	  fi ;								\
 	fi
 
-install-gnome:: screensaver-properties.desktop
+xxxinstall-gnome:: screensaver-properties.desktop
 	@lost=""							     ;\
          if [ "$(GNOME_DATADIR)" != "" ]; then                                \
 	                                                                      \
@@ -464,10 +464,6 @@ install-gnome:: screensaver-properties.d
              echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
            fi                                                                ;\
-           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
-           fi                                                                ;\
            if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then              \
              echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
@@ -488,16 +484,6 @@ install-gnome:: screensaver-properties.d
            fi                                                                ;\
 	                                                                      \
            echo $(INSTALL_DATA) screensaver-properties.desktop		      \
-             $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\
-	                                                                      \
-           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
-             $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\
-             then true                                                       ;\
-           else                                                               \
-             lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)"                 ;\
-           fi                                                                ;\
-	                                                                      \
-           echo $(INSTALL_DATA) screensaver-properties.desktop		      \
              $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
 	                                                                      \
            if   $(INSTALL_DATA) screensaver-properties.desktop		      \
@@ -531,7 +517,7 @@ install-gnome:: screensaver-properties.d
            fi                                                                ;\
          fi
 
-install-gnome:: screensaver-properties-capplet
+xxxinstall-gnome:: screensaver-properties-capplet
 	@if [ "$(GNOME_DATADIR)" != "" ]; then                                \
            if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then               \
              echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
@@ -630,8 +616,6 @@ uninstall-gnome::
           f=screensaver-properties.desktop                                   ;\
           echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
                rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
-          echo rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f                   ;\
-               rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f                   ;\
           echo rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f                   ;\
                rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f                   ;\
           echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f                  ;\