summaryrefslogtreecommitdiff
path: root/x11-wm/xfce4/files/patch-aa
blob: 1c7ba54b9597d5ef536747fc23756143507ea442 (plain) (blame)
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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
*** Imakefile.orig	Wed Aug 20 08:24:00 1997
--- Imakefile	Wed Oct  1 09:09:23 1997
***************
*** 1,7 ****
! XPIXMAPDIR    = /usr/X11/include/X11/pixmaps
! XBINDIR       = /usr/X11/bin
! XFCE_DIR      = /var/XFCE
! XFCE_PAL      = /var/XFCE/palettes
  FVWM_MODULES  = /usr/lib/X11/fvwm
  FVWM2_MODULES = /usr/lib/X11/fvwm2
  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
--- 1,7 ----
! XPIXMAPDIR    = /usr/X11R6/lib/X11/XFCE/pixmaps
! XBINDIR       = /usr/X11R6/bin
! XFCE_DIR      = /usr/X11R6/lib/X11/XFCE
! XFCE_PAL      = /usr/X11R6/lib/X11/XFCE/palettes
  FVWM_MODULES  = /usr/lib/X11/fvwm
  FVWM2_MODULES = /usr/lib/X11/fvwm2
  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
***************
*** 17,24 ****
   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
   sendinfo.o startup.o tiptools.o
  
! XCOMM for LINUX: 
! EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm 
  
  XCOMM for static link with XForms
  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
--- 17,24 ----
   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
   sendinfo.o startup.o tiptools.o
  
! XCOMM for FreeBSD: 
! EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm 
  
  XCOMM for static link with XForms
  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
***************
*** 60,85 ****
  install_palettes::
  	mkdir -p $(XFCE_PAL)
  	chmod a+rw $(XFCE_PAL)
! 	cp -vpb palettes\/* $(XFCE_PAL)
  
  install_bin::   	XFCE install.man
  	@if [ -d $(XBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
! 	@cp -vfb XFCE $(XBINDIR);
! 	ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
  	@chmod 0755 $(XBINDIR)/XFCE;
  	@if [ -d $(FVWM_MODULES) ]; then \
! 	ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
  	@if [ -d $(FVWM2_MODULES) ]; then \
! 	ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
  	mkdir -p $(XFCE_DIR)
  	mkdir -p $(XFCE_DIR)/doc
! 	@cp -vpb sample.* $(XFCE_DIR)/;
! 	@cp -vpb INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
! 	ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;
! 	ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;
! 	ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;
! 	ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;
  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
--- 60,85 ----
  install_palettes::
  	mkdir -p $(XFCE_PAL)
  	chmod a+rw $(XFCE_PAL)
! 	cp -R palettes\/* $(XFCE_PAL)
  
  install_bin::   	XFCE install.man
  	@if [ -d $(XBINDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
! 	@cp -R XFCE $(XBINDIR);
! 	ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
  	@chmod 0755 $(XBINDIR)/XFCE;
  	@if [ -d $(FVWM_MODULES) ]; then \
! 	ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
  	@if [ -d $(FVWM2_MODULES) ]; then \
! 	ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
  	mkdir -p $(XFCE_DIR)
  	mkdir -p $(XFCE_DIR)/doc
! 	@cp -R sample.* $(XFCE_DIR)/;
! 	@cp -R INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
! 	ln -sf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;
! 	ln -sf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;
! 	ln -sf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;
! 	ln -sf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;
  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
***************
*** 97,126 ****
  
  install_logo::		install_bin install_palettes
  	@mkdir -p $(XFCE_DIR)
! 	@cp -vpb XFCE_full.logo $(XFCE_DIR);
! 	@cp -vpb XFCE_dithered.logo $(XFCE_DIR);
  
  install_full::		install_logo
! 	ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
  
  install_dithered::	install_logo
! 	ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
  
  install::		install_full
  
  francais::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  english::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  italiano::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  deutsch::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
--- 97,126 ----
  
  install_logo::		install_bin install_palettes
  	@mkdir -p $(XFCE_DIR)
! 	@cp -R XFCE_full.logo $(XFCE_DIR);
! 	@cp -R XFCE_dithered.logo $(XFCE_DIR);
  
  install_full::		install_logo
! 	ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
  
  install_dithered::	install_logo
! 	ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
  
  install::		install_full
  
  francais::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  english::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  italiano::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
  
  deutsch::
! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
  	       $(DESTDIR)$(XAPPLOADDIR)/XFce