diff --git a/xwords4/wince/Makefile b/xwords4/wince/Makefile index 5267f1c41..8e81160e4 100644 --- a/xwords4/wince/Makefile +++ b/xwords4/wince/Makefile @@ -263,9 +263,9 @@ bmps/%.bmp: bmps/%.pgm CAB: $(TARGET) $(DLLS) $(STRIP) $< - ./exe2cab.pl $< - for DLL in $(DLLS); do \ - ./dll2cab.pl $$DLL; \ + (cd $(BUILTDIR); PATH=../../scripts:$$PATH exe2cab.pl $(notdir $<)) + for DLL in $(notdir $(DLLS)); do \ + (cd $(BUILTDIR); PATH=../../scripts:$$PATH dll2cab.pl $$DLL); \ done SHIP: $(TARGET) diff --git a/xwords4/wince/dll2cab.pl b/xwords4/wince/scripts/dll2cab.pl similarity index 94% rename from xwords4/wince/dll2cab.pl rename to xwords4/wince/scripts/dll2cab.pl index f1bd0f21a..055faafa3 100755 --- a/xwords4/wince/dll2cab.pl +++ b/xwords4/wince/scripts/dll2cab.pl @@ -43,7 +43,7 @@ sub main() { my $appname = $cabname; $cabname .= ".cab"; - my $cmd = "./scripts/pocketpc-cab -p $provider -a $appname " + my $cmd = "pocketpc-cab -p $provider -a $appname " . "$fname $cabname"; print( STDERR $cmd, "\n"); `$cmd`; diff --git a/xwords4/wince/exe2cab.pl b/xwords4/wince/scripts/exe2cab.pl similarity index 93% rename from xwords4/wince/exe2cab.pl rename to xwords4/wince/scripts/exe2cab.pl index 86c2da015..9f75c4289 100755 --- a/xwords4/wince/exe2cab.pl +++ b/xwords4/wince/scripts/exe2cab.pl @@ -46,7 +46,7 @@ sub main() { print FILE "$tmpfile "; print FILE '%CE1%\\\\Crosswords', "\n"; - print FILE "../dawg/English/BasEnglish2to8.xwd "; + print FILE "../../../dawg/English/BasEnglish2to8.xwd "; print FILE '%CE1%\\\\Crosswords', "\n"; # print FILE "$ENV{'CEOPT_ROOT'}/opt/mingw32ce/arm-wince-mingw32ce/bin/mingwm10.dll "; @@ -60,7 +60,7 @@ sub main() { my $appname = $cabname; $cabname .= ".cab"; - my $cmd = "./scripts/pocketpc-cab -p $provider -a $appname " + my $cmd = "pocketpc-cab -p $provider -a $appname " . "$fname $cabname"; print( STDERR $cmd, "\n"); `$cmd`; diff --git a/xwords4/wince/xwd2cab.pl b/xwords4/wince/scripts/xwd2cab.pl similarity index 100% rename from xwords4/wince/xwd2cab.pl rename to xwords4/wince/scripts/xwd2cab.pl