[pdfmod] Some more make distcheck fixes

[Bertrand Lorentz <blorentz src gnome org>]

commit 5072bdb15384e33d51def24a10ce6dc1f7fbb909
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Mon Aug 17 21:38:51 2009 +0200

    Some more make distcheck fixes

 Makefile.am                   |    7 +++++--
 lib/poppler-sharp/Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 61db856..7a05630 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ if ENABLE_RELEASE
  SUBDIRS =  lib/PdfSharp lib/poppler-sharp src po docs data
 endif
 
-INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
+INSTALL_DIR_RESOLVED = $(firstword $(subst , $(pkglibdir), $(INSTALL_DIR)))
 
 run:
 	cd bin; mono --debug PdfMod.exe;
@@ -22,7 +22,10 @@ install-data-hook:
 	done;
 
 uninstall-hook:
-	for ASM in "$(BUNDLE_ASSEMBLIES) $(BUNDLE_FILES)"; do \
+	for ASM in $(BUNDLE_ASSEMBLIES); do \
+		rm -f $(DESTDIR)$(INSTALL_DIR_RESOLVED)/`basename $$ASM`; \
+	done;
+	for ASM in $(BUNDLE_FILES); do \
 		rm -f $(DESTDIR)$(INSTALL_DIR_RESOLVED)/`basename $$ASM`; \
 	done;
 
diff --git a/lib/poppler-sharp/Makefile.am b/lib/poppler-sharp/Makefile.am
index d4103b8..0e1248d 100644
--- a/lib/poppler-sharp/Makefile.am
+++ b/lib/poppler-sharp/Makefile.am
@@ -127,4 +127,4 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	mkdir -p $(shell dirname $(ASSEMBLY))
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	cp poppler-sharp/poppler-sharp.dll.config $(BUILD_DIR)
+	cp $(srcdir)/poppler-sharp/poppler-sharp.dll.config $(BUILD_DIR)