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/bundle | |
| 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/bundle')
| -rw-r--r-- | xorg-server/hw/xquartz/bundle/Info.plist.cpp | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/bundle/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/bundle/Makefile.in | 11 |
3 files changed, 12 insertions, 5 deletions
diff --git a/xorg-server/hw/xquartz/bundle/Info.plist.cpp b/xorg-server/hw/xquartz/bundle/Info.plist.cpp index 6d951ada8..d385e078b 100644 --- a/xorg-server/hw/xquartz/bundle/Info.plist.cpp +++ b/xorg-server/hw/xquartz/bundle/Info.plist.cpp @@ -7,11 +7,11 @@ <key>CFBundleExecutable</key> <string>X11</string> <key>CFBundleGetInfoString</key> - <string>APPLE_APPLICATION_NAME</string> + <string>LAUNCHD_ID_PREFIX.X11</string> <key>CFBundleIconFile</key> <string>X11.icns</string> <key>CFBundleIdentifier</key> - <string>APPLE_APPLICATION_ID</string> + <string>LAUNCHD_ID_PREFIX.X11</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am index ea02cd620..f8b96d8c4 100644 --- a/xorg-server/hw/xquartz/bundle/Makefile.am +++ b/xorg-server/hw/xquartz/bundle/Makefile.am @@ -1,7 +1,7 @@ include cpprules.in CPP_FILES_FLAGS = \ - -DAPPLE_APPLICATION_ID="$(APPLE_APPLICATION_ID)" \ + -DLAUNCHD_ID_PREFIX="$(LAUNCHD_ID_PREFIX)" \ -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" if XQUARTZ_SPARKLE diff --git a/xorg-server/hw/xquartz/bundle/Makefile.in b/xorg-server/hw/xquartz/bundle/Makefile.in index b6b69c6bd..8a56b79e8 100644 --- a/xorg-server/hw/xquartz/bundle/Makefile.in +++ b/xorg-server/hw/xquartz/bundle/Makefile.in @@ -64,6 +64,12 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \ $(top_builddir)/include/version-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -95,9 +101,9 @@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@ -APPLE_APPLICATION_ID = @APPLE_APPLICATION_ID@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -186,6 +192,7 @@ KDRIVE_LIBS = @KDRIVE_LIBS@ KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@ KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@ KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@ +LAUNCHD_ID_PREFIX = @LAUNCHD_ID_PREFIX@ LD = @LD@ LDFLAGS = @LDFLAGS@ LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@ @@ -405,7 +412,7 @@ MANDEFS = \ -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS) SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp -CPP_FILES_FLAGS = -DAPPLE_APPLICATION_ID="$(APPLE_APPLICATION_ID)" \ +CPP_FILES_FLAGS = -DLAUNCHD_ID_PREFIX="$(LAUNCHD_ID_PREFIX)" \ -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" \ $(am__append_1) noinst_PRE = Info.plist.cpp |