update paths in Makefiles

fperrad · Feb 24, 2009 · a98ce86 · a98ce86
1 parent 6ee6800
commit a98ce86
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -44,8 +44,8 @@ sub create_makefiles {
     my %config = @_;
     my %makefiles = (
         'config/makefiles/root.in' => 'Makefile',
-        'config/makefiles/pmc.in'  => 'pmc/Makefile',
-        'config/makefiles/ops.in'  => 'ops/Makefile',
+        'config/makefiles/pmc.in'  => 'src/pmc/Makefile',
+        'config/makefiles/ops.in'  => 'src/ops/Makefile',
     );
     my $build_tool = $config{libdir} . $config{versiondir}
                    . '/tools/dev/gen_makefile.pl';

diff --git a/config/makefiles/ops.in b/config/makefiles/ops.in
@@ -67,8 +67,8 @@ install:
 uninstall:
 	$(RM_F) "$(INSTALL_DIR)/wmls_ops*$(LOAD_EXT)"
 
-Makefile: ../config/makefiles/ops.in
-	cd .. && $(PERL) Configure.pl
+Makefile: ../../config/makefiles/ops.in
+	cd ../.. && $(PERL) Configure.pl
 
 clean:
 	$(RM_F) "*$(LOAD_EXT)" "*$(O)" "*.c" "*.h" \

diff --git a/config/makefiles/pmc.in b/config/makefiles/pmc.in
@@ -98,8 +98,8 @@ install:
 uninstall:
 	$(RM_F) $(INSTALL_DIR)/$(WMLSCRIPT_GROUP)$(LOAD_EXT)
 
-Makefile: ../config/makefiles/pmc.in
-	cd .. && $(PERL) Configure.pl
+Makefile: ../../config/makefiles/pmc.in
+	cd ../.. && $(PERL) Configure.pl
 
 clean:
 	$(RM_F) "*$(LOAD_EXT)" "*$(O)" "*.c" "*.h" "*.dump" \

diff --git a/config/makefiles/root.in b/config/makefiles/root.in
@@ -16,9 +16,9 @@ LOAD_EXT      = @load_ext@
 O             = @o@
 
 # Various paths
-PMC_DIR       = pmc
-OPS_DIR       = ops
-LIBPATH       = runtime
+PMC_DIR       = src/pmc
+OPS_DIR       = src/ops
+LIBPATH       = src/runtime
 
 ## Setup some commands
 MAKE          = @make_c@