I'm not familiar with the problem. Is this the canonical way to actually do this? It seems a bit odd, but it looks fine to me if just a bit quirky:
Reviewed-by: Jeremy Sequoia <[email protected]> > On Apr 4, 2017, at 4:49 PM, Mihail Konev <[email protected]> wrote: > > Fixes DESTDIR not being included in x11appdir, allowing to run distcheck > as non-root. > > Signed-off-by: Mihail Konev <[email protected]> > --- > v2: Move DESTDIR to configure. Add missing Cc. > > configure.ac | 4 ++-- > hw/xquartz/bundle/Makefile.am | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 3196e42df16a..7e44f2c3166c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -566,8 +566,8 @@ AC_ARG_WITH(serverconfig-path, > AS_HELP_STRING([--with-serverconfig-path=PATH], > [ SERVERCONFIG="$withval" ], > [ SERVERCONFIG="${libdir}/xorg" ]) > AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], > [Path to the Applications directory (default: /Applications/Utilities)]), > - [ APPLE_APPLICATIONS_DIR="${withval}" ], > - [ > APPLE_APPLICATIONS_DIR="/Applications/Utilities" ]) > + [ > APPLE_APPLICATIONS_DIR='$(DESTDIR)'"${withval}" ], > + [ > APPLE_APPLICATIONS_DIR='$(DESTDIR)'"/Applications/Utilities" ]) > AC_SUBST([APPLE_APPLICATIONS_DIR]) > AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], > [Name for the .app (default: X11)]), > [ APPLE_APPLICATION_NAME="${withval}" ], > diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am > index 424a7475f063..c8d29e6718c0 100644 > --- a/hw/xquartz/bundle/Makefile.am > +++ b/hw/xquartz/bundle/Makefile.am > @@ -11,12 +11,12 @@ CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE > -DXQUARTZ_SPARKLE_FEED_URL="$(XQUARTZ_SPARK > endif > > install-data-hook: > - $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) > $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install > + $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) > $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install > > uninstall-hook: > - $(RM) -rf > $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources > - $(RM) -rf > $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist > - $(RM) -rf > $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo > + $(RM) -rf > $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources > + $(RM) -rf > $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist > + $(RM) -rf > $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo > > noinst_PRE = Info.plist.cpp > noinst_DATA = $(noinst_PRE:plist.cpp=plist) > -- > 2.9.2 > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
