]>
Commit | Line | Data |
---|---|---|
48fabef6 JB |
1 | From: Alan Coopersmith <alan.coopersmith@sun.com> |
2 | Date: Sat, 14 Oct 2006 02:05:28 +0000 (-0700) | |
3 | Subject: Make sure xorgcfg files are included even when dist made with --disable-xorgcfg | |
4 | X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=b9108a13fc126d97c0393f911a1d9292563444ce | |
5 | ||
6 | Make sure xorgcfg files are included even when dist made with --disable-xorgcfg | |
7 | --- | |
8 | ||
9 | --- a/hw/xfree86/utils/xorgcfg/Makefile.am | |
10 | +++ b/hw/xfree86/utils/xorgcfg/Makefile.am | |
11 | @@ -56,6 +56,7 @@ endif | |
12 | if NEED_STRLCAT | |
13 | STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c | |
14 | endif | |
15 | +endif BUILD_XORGCFG | |
16 | ||
17 | xorgcfg_SOURCES = \ | |
18 | accessx.c \ | |
19 | @@ -95,10 +96,7 @@ xorgcfg_SOURCES = \ | |
20 | xf86config.h \ | |
21 | $(STRL_SRCS) | |
22 | ||
23 | -XBMdir = $(includedir)/X11/bitmaps | |
24 | -XPMdir = $(includedir)/X11/pixmaps | |
25 | - | |
26 | -XBM_DATA = \ | |
27 | +BITMAPS = \ | |
28 | card.xbm \ | |
29 | keyboard.xbm \ | |
30 | monitor.xbm \ | |
31 | @@ -112,7 +110,7 @@ XBM_DATA = \ | |
32 | shorter.xbm \ | |
33 | taller.xbm | |
34 | ||
35 | -XPM_DATA = \ | |
36 | +PIXMAPS = \ | |
37 | card.xpm \ | |
38 | computer.xpm \ | |
39 | keyboard.xpm \ | |
40 | @@ -122,6 +120,13 @@ XPM_DATA = \ | |
41 | # Rules needed to cpp man page & app-defaults | |
42 | include $(top_srcdir)/cpprules.in | |
43 | ||
44 | +if BUILD_XORGCFG | |
45 | +XBMdir = $(includedir)/X11/bitmaps | |
46 | +XPMdir = $(includedir)/X11/pixmaps | |
47 | + | |
48 | +XBM_DATA = $(BITMAPS) | |
49 | +XPM_DATA = $(PIXMAPS) | |
50 | + | |
51 | # App default files (*.ad) | |
52 | ||
53 | appdefaultdir = @APPDEFAULTDIR@ | |
54 | @@ -146,7 +151,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_ | |
55 | ||
56 | all-local: $(appman_PRE) $(appman_DATA) | |
57 | ||
58 | -EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre | |
59 | BUILT_SOURCES = $(appman_PRE) | |
60 | CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA) | |
61 | ||
62 | @@ -156,4 +160,6 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man | |
63 | -rm -f $@ | |
64 | $(LN_S) $< $@ | |
65 | ||
66 | -endif | |
67 | +endif BUILD_XORGCFG | |
68 | + | |
69 | +EXTRA_DIST = $(BITMAPS) $(PIXMAPS) XOrgCfg.pre xorgcfg.man.pre | |
70 | --- xorg-server-1.1.99.901/hw/xfree86/utils/xorgcfg/XOrgCfg.pre.orig 1970-01-01 01:00:00.000000000 +0100 | |
71 | +++ xorg-server-1.1.99.901/hw/xfree86/utils/xorgcfg/XOrgCfg.pre 2006-10-15 10:53:57.869810250 +0200 | |
72 | @@ -0,0 +1,1852 @@ | |
73 | +!! $XdotOrg: $ | |
74 | +!! | |
75 | +!! Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) | |
76 | +!! | |
77 | +!! Permission is hereby granted, free of charge, to any person obtaining a | |
78 | +!! copy of this software and associated documentation files (the "Software"), | |
79 | +!! to deal in the Software without restriction, including without limitation | |
80 | +!! the rights to use, copy, modify, merge, publish, distribute, sublicense, | |
81 | +!! and/or sell copies of the Software, and to permit persons to whom the | |
82 | +!! Software is furnished to do so, subject to the following conditions: | |
83 | +!! | |
84 | +!! The above copyright notice and this permission notice shall be included in | |
85 | +!! all copies or substantial portions of the Software. | |
86 | +!! | |
87 | +!! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
88 | +!! IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
89 | +!! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | |
90 | +!! CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | |
91 | +!! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF | |
92 | +!! OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
93 | +!! SOFTWARE. | |
94 | +!! | |
95 | +!! Except as contained in this notice, the name of Conectiva Linux shall | |
96 | +!! not be used in advertising or otherwise to promote the sale, use or other | |
97 | +!! dealings in this Software without prior written authorization from | |
98 | +!! Conectiva Linux. | |
99 | +!! | |
100 |