diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-15 15:05:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-15 15:05:16 +0000 |
| commit | 1915b018a54e991c9289ee0c03488294e890caea (patch) | |
| tree | 0eccc8afdcbcee10f91cfe418fc8c7cdcd4b0163 /xorg-server/hw/xquartz/mach-startup/Makefile.am | |
| parent | 8bfa2f879ea38340a633c29120758a390b63667e (diff) | |
| parent | 4db64b701ca08687df5932321d48f2ef29b99fed (diff) | |
| download | vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.tar.gz vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.tar.bz2 vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/mach-startup/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am index 2901b6559..334f06d43 100644 --- a/xorg-server/hw/xquartz/mach-startup/Makefile.am +++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am @@ -3,7 +3,9 @@ AM_CPPFLAGS = \ -DXSERVER_VERSION=\"$(VERSION)\" \ -DX11BINDIR=\"$(bindir)\" -x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) + +x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS x11app_PROGRAMS = X11.bin dist_X11_bin_SOURCES = \ |