fix testing when duplicate files are not included

szabgab · Nov 20, 2011 · ab1e225 · ab1e225
1 parent 7e1c8ab
commit ab1e225
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -49,12 +49,12 @@ MYMETA\.(?:yml|yaml|json)$
 SETUP.bat
 
 # copied to the share/ directory
-#^public\b
-#^schema\b
-#^views\b
-#^environments\b
-#^bin\n
-#^config.yml
+^public\b
+^schema\b
+^views\b
+^environments\b
+^bin\n
+^config.yml
 
 
 # need to include the share directory as well as apparently

diff --git a/script/dwimmer_setup.pl b/script/dwimmer_setup.pl
@@ -72,9 +72,11 @@
 my $dist_dir;
 
 # When we are in the development environment (have .git) set this to the root directory
-# When we are in the installation environment (have Makefile.PL) set this to the root directory
-if (grep { -e File::Spec->catdir(dirname(dirname abs_path($0)) , $_) } ('.git', 'Makefile.PL')) {
+# When we are in the installation environment (have Makefile.PL) set this to the share/ subdirectory
+if (-e File::Spec->catdir(dirname(dirname abs_path($0)) , '.git') ) {
     $dist_dir = dirname(dirname abs_path($0))
+} elsif (-e File::Spec->catdir(dirname(dirname abs_path($0)) , 'Makefile.PL') ) {
+    $dist_dir = File::Spec->catdir( dirname(dirname abs_path($0)), 'share' );
 } else {
     $dist_dir = File::ShareDir::dist_dir('Dwimmer');
 }