From 6e7e9be94a4847e3dc1076d99966a17fe1019318 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 22 Oct 2009 17:53:21 +0000 Subject: [PATCH] retest windows install git-svn-id: svn+q:///qpdf/trunk@865 71b93d88-0707-0410-a8cf-f5a4172ac649 --- copy_dlls | 3 +-- make/mingw.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/copy_dlls b/copy_dlls index 4e8f09f4..6cfcfe02 100755 --- a/copy_dlls +++ b/copy_dlls @@ -19,7 +19,7 @@ while () { my $dll = $1; $dll =~ tr/A-Z/a-z/; - next if $dll =~ m/^(kernel32|msvcr)\.dll$/; + next if $dll =~ m/^(kernel32|msvcrt)\.dll$/; $dlls{$dll} = 1; } } @@ -66,7 +66,6 @@ foreach my $f (@final) print "Copying $f to $destdir\n"; system("cp -p $f $destdir") == 0 or die "$whoami: copy $f to $destdir failed\n"; - print $f, "\n"; } sub get_manifest_dirs diff --git a/make/mingw.mk b/make/mingw.mk index 376a4a43..ac7fa4ca 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -79,5 +79,5 @@ INSTALL_DIR = install-mingw STATIC_LIB_NAME = libqpdf.a include make/installwin.mk install: installwin - strip $(INSTALL_DIR)/bin/*.exe - strip $(INSTALL_DIR)/bin/*.dll + strip $(DEST)/bin/*.exe + strip $(DEST)/bin/*.dll