diff options
author | marha <marha@users.sourceforge.net> | 2010-02-14 21:52:51 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-02-14 21:52:51 +0000 |
commit | 00e6751183c1e854ea3eba746b101449b32201a4 (patch) | |
tree | 3494085d6728e086582f30c8a68846d81840303d /xorg-server/hw/xwin/Makefile.am | |
parent | ac637a8cd15f3977f44b701c7ac71a561763c1d8 (diff) | |
parent | 8d38172d866775594af3185ae3fbd8d750677650 (diff) | |
download | vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.gz vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.bz2 vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xwin/Makefile.am')
-rw-r--r-- | xorg-server/hw/xwin/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index f460f7abe..8b6b6a06d 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am @@ -153,7 +153,7 @@ XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $( XWin_LDFLAGS = -mwindows .rc.o: - $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\" + $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include winprefsyacc.h: winprefsyacc.c winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h @@ -186,11 +186,13 @@ XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir) +xwinconfigdir = $(sysconfdir)/X11 +xwinconfig_DATA = system.XWinrc + include $(top_srcdir)/cpprules.in EXTRA_DIST = \ $(MAN_SRCS) \ - _usr_X11R6_lib_X11_system.XWinrc \ X.ico \ XWin.rc \ xlaunch/config.cc \ |