summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 04:01:29 (UTC)
committer kergoth <kergoth>2003-01-16 04:01:29 (UTC)
commit73927fe1c095507ce7fdd310917521fcd305b7e5 (patch) (unidiff)
treed09eb7d1e2a845b6e974150e369ea73dca89cb64
parent4e6e6deda15467fe253b546136df00cf5b7ebd02 (diff)
downloadopie-73927fe1c095507ce7fdd310917521fcd305b7e5.zip
opie-73927fe1c095507ce7fdd310917521fcd305b7e5.tar.gz
opie-73927fe1c095507ce7fdd310917521fcd305b7e5.tar.bz2
Use paths relative to OPIEDIR in generated configs.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
-rwxr-xr-xscripts/makecfg.pl37
2 files changed, 8 insertions, 31 deletions
diff --git a/Rules.make b/Rules.make
index f85779c..817c2bc 100644
--- a/Rules.make
+++ b/Rules.make
@@ -87,4 +87,4 @@ endef
87 87
88define makecfg 88define makecfg
89 $(TOPDIR)/scripts/makecfg.pl $1 89 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
90endef 90endef
diff --git a/scripts/makecfg.pl b/scripts/makecfg.pl
index 5dd66a4..d7dc41e 100755
--- a/scripts/makecfg.pl
+++ b/scripts/makecfg.pl
@@ -11,6 +11,7 @@ while(<FILE>){$packages.=$_;}
11close(FILE); 11close(FILE);
12 12
13my ($dirname,$dir,$file,@files,$filename,$tagname,$name,$caps,$pre,$post,$sources,@dupecheck); 13my ($dirname,$dir,$file,@files,$filename,$tagname,$name,$caps,$pre,$post,$sources,@dupecheck,$basedir);
14$file = shift || die; 14$file = shift || die;
15$basedir = shift;
15push(@files, $file); 16push(@files, $file);
16 17
@@ -53,32 +54,4 @@ close(CFG);
53exit; 54exit;
54 55
55open(FILE,">$dir/config.in");
56select(FILE);
57print "menu \"$name\"\n";
58print "\n";
59my @subdirs=();
60my @dirs;
61foreach(grep(/^$dir/, @dirs)){
62 chomp;
63 /^$dir\/$name.pro$/ && next;
64 my $localdir=$_;
65 if($dir=~m,^$localdir$,){
66 next;
67 }
68#($locadir=$_)~s,/[^/]+$,,g;
69 if($localdir=~/^\.$/){next;}
70 if(grep(/^$localdir$/, @subdirs)){next;}
71 my $nslashes = $localdir =~ tr!/!!;
72 my $dirnslashes = $dir =~ tr!/!!;
73 $dirnslashes++;
74 if($dirnslashes != $nslashes ){next;}
75 print STDERR "$localdir/config.in\n";
76 print " source $localdir/config.in\n";
77 push(@subdirs, $localdir);
78 print "endmenu\n";
79 select(STDOUT);
80 close(FILE);
81}
82
83use vars qw/*name *dir *prune/; 56use vars qw/*name *dir *prune/;
84*name = *File::Find::name; 57*name = *File::Find::name;
@@ -97,5 +70,9 @@ sub wanted {
97 # print STDERR "nslashes is $nslashes\n"; 70 # print STDERR "nslashes is $nslashes\n";
98 if($dirnslashes != $nslashes){return;} 71 if($dirnslashes != $nslashes){return;}
99 print " source " . $File::Find::dir . "/config.in\n"; 72 my $reldir;
73 if (defined($basedir)) {
74 ($reldir=$File::Find::dir)=~s,^$basedir/,,;
75 }
76 print " source " . $reldir . "/config.in\n";
100 push(@dupecheck, $File::Find::dir . "/config.in"); 77 push(@dupecheck, $File::Find::dir . "/config.in");
101 } 78 }