diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
| commit | ac80633ce275edddaa3e4fa2ae0c048ed00f7d74 (patch) | |
| tree | 7d4ceffed59f2782533d3485c075f605ab1b9c61 /xorg-server/hw/xquartz/mach-startup | |
| parent | 6fc6cb8c935fab174e4582909c1cb4f12bd598bf (diff) | |
| download | vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.gz vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.bz2 vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.zip | |
svn merge -c505 ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/mach-startup')
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/Makefile.in | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am index 334f06d43..4dff45aa8 100644 --- a/xorg-server/hw/xquartz/mach-startup/Makefile.am +++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = \ -DXSERVER_VERSION=\"$(VERSION)\" \ -DX11BINDIR=\"$(bindir)\" -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS x11app_PROGRAMS = X11.bin diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.in b/xorg-server/hw/xquartz/mach-startup/Makefile.in index 799c5e626..d0d468cbb 100644 --- a/xorg-server/hw/xquartz/mach-startup/Makefile.in +++ b/xorg-server/hw/xquartz/mach-startup/Makefile.in @@ -162,6 +162,7 @@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@ +DEFAULT_LOGDIR = @DEFAULT_LOGDIR@ DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@ DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@ DEFS = @DEFS@ @@ -293,6 +294,8 @@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ +SELINUX_CFLAGS = @SELINUX_CFLAGS@ +SELINUX_LIBS = @SELINUX_LIBS@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHA1_CFLAGS = @SHA1_CFLAGS@ @@ -434,7 +437,7 @@ AM_CPPFLAGS = \ -DXSERVER_VERSION=\"$(VERSION)\" \ -DX11BINDIR=\"$(bindir)\" -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS dist_X11_bin_SOURCES = \ bundle-main.c |