next round of build system cleanup - convert package/ to new structure

[openwrt/staging/lynxis/omap.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 6ed128aae22ff6c8584d9b97d43b24ce9c119ed8..16a120a7ae9bf2bb9c8846164dc4d336a62ac03a 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -576,12 +576,12 @@ sub gen_package_mk() {
                        undef $idx if $idx =~ /^(kernel)|(base-files)$/;
                        if ($idx) {
                                next if $dep{$pkg->{src}."->".$idx};
-                               $depline .= " $idx\-compile";
+                               $depline .= " \$(curdir)/$idx/compile";
                                $dep{$pkg->{src}."->".$idx} = 1;
                        }
                }
                if ($depline) {
-                       $line .= $pkg->{subdir}."$pkg->{src}-compile: $depline\n";
+                       $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile := $depline\n";
                }
        }
        
@@ -604,7 +604,7 @@ $cmds \\
        ) > \$@
        
 ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
-  preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
 endif
 EOF
        }