]>
Commit | Line | Data |
---|---|---|
250103b2 JR |
1 | --- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am~ 2011-10-31 09:14:40.000000000 +0100 |
2 | +++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-04-19 08:15:51.849379891 +0200 | |
3 | @@ -63,7 +63,7 @@ | |
4 | BUILT_SOURCES = $(nodist_Xvnc_SOURCES) | |
5 | ||
6 | fb.h: $(top_srcdir)/fb/fb.h | |
7 | - cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h | |
8 | + cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h | |
9 | ||
10 | pixman.h: | |
11 | for i in ${XSERVERLIBS_CFLAGS}; do \ | |
12 | @@ -72,10 +72,10 @@ | |
13 | fi; \ | |
14 | done; \ | |
15 | if [ ! "$$PIXMANINCDIR" = "" ]; then \ | |
16 | - cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h; \ | |
17 | + cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/g' > $(srcdir)/pixman.h; \ | |
18 | else \ | |
19 | echo Pixman include directory not set in XSERVERLIBS_CFLAGS \(perhaps Pixman was not found by configure?\); \ | |
20 | fi | |
21 | ||
22 | fbrop.h: $(top_srcdir)/fb/fbrop.h | |
23 | - cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h | |
24 | + cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h |