From 7b33ef74738d6a557cb25aeb14693b2a340c0e12 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 13 Nov 2010 15:46:16 -0800 Subject: [PATCH 1/2] dix: Fix make distcheck Signed-off-by: Jeremy Huddleston Reviewed-by: Dan Nicholson --- dix/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/dix/Makefile.am b/dix/Makefile.am index 5e2dad7d3..59e512ba7 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -1,5 +1,6 @@ noinst_LTLIBRARIES = libdix.la libmain.la +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(DIX_CFLAGS) libmain_la_SOURCES = \ From c5975722a95c41b8715a4612fc1c3275f8e9b59e Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 13 Nov 2010 16:04:10 -0800 Subject: [PATCH 2/2] XQuartz: Fix make distcheck Signed-off-by: Jeremy Huddleston Reviewed-by: Cyril Brulebois --- hw/xquartz/bundle/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am index c4d77c099..8a206cf4b 100644 --- a/hw/xquartz/bundle/Makefile.am +++ b/hw/xquartz/bundle/Makefile.am @@ -12,7 +12,9 @@ install-data-hook: $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install uninstall-hook: - $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app + $(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 noinst_PRE = Info.plist.cpp noinst_DATA = $(noinst_PRE:plist.cpp=plist)