Fixed builds from a directory outside of the sourcetree.

 - Bugreported and partically patched by: Frederic L. W. Meunier

diff --git a/Makefile.am b/Makefile.am
index ee1f71f..80ad619 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST+= \
                build-static
 
 ROS_CVS:= \
-               $(foreach rosdir,$(REACTOS_SOURCES),$(shell find $(rosdir) -name CVS -type d))
+               $(foreach rosdir,$(REACTOS_SOURCES),$(shell find $(srcdir)/$(rosdir) -name CVS -type d))
 
 BUILT_SOURCES+= \
                $(ROS_CVS)

diff --git a/src/install/acquire/Makefile.am b/src/install/acquire/Makefile.am
index 82d5d77..369c4b0 100644 (file)
--- a/src/install/acquire/Makefile.am
+++ b/src/install/acquire/Makefile.am
@@ -80,7 +80,7 @@ captive_install_acquire-ui-gnome-interface.$(OBJEXT): ui-gnome-callbacks.h
 if HAVE_GLADE_WRITESOURCE
 # touch(1) as 'ui-gnome-callbacks.h' are not overwritten if not changed:
 $(GLADE_OUT): $(GLADE_IN)
-       sh $(top_srcdir)/macros/glade-w.sh $<
+       sh $(top_builddir)/macros/glade-w.sh $<
        @touch ui-gnome-callbacks.h
 
 endif

diff --git a/src/libcaptive/ke/Makefile.am b/src/libcaptive/ke/Makefile.am
index 41d2517..6ba224e 100644 (file)
--- a/src/libcaptive/ke/Makefile.am
+++ b/src/libcaptive/ke/Makefile.am
@@ -48,6 +48,10 @@ libke_la_SOURCES+=exports.c
 if HAVE_PERL
 # FIXME: a difference between "ntoskrnl/ntoskrnl.def" vs. "ntoskrnl/ntoskrnl.edf"?
 exports.c: exports.captivesym captivesym.pl exports.def $(top_srcdir)/reactos/ntoskrnl/ntoskrnl.def $(top_srcdir)/reactos/hal/hal/hal.def
-       $(PERL) captivesym.pl $(top_srcdir)/reactos/ntoskrnl/ntoskrnl.def $(top_srcdir)/reactos/hal/hal/hal.def exports.def $< >$@
+       $(PERL) $(srcdir)/captivesym.pl \
+                       $(top_srcdir)/reactos/ntoskrnl/ntoskrnl.def \
+                       $(top_srcdir)/reactos/hal/hal/hal.def \
+                       $(srcdir)/exports.def \
+                       $< >$@
 
 endif

diff --git a/src/libcaptive/sandbox/client-CaptiveIOChannel.h b/src/libcaptive/sandbox/client-CaptiveIOChannel.h
index 63bb026..e380207 100644 (file)
--- a/src/libcaptive/sandbox/client-CaptiveIOChannel.h
+++ b/src/libcaptive/sandbox/client-CaptiveIOChannel.h
@@ -23,7 +23,7 @@
 
 #include <glib/gmacros.h>
 #ifdef ORBIT2  /* Prevent missing $(ORBIT_CFLAGS) outside of libcaptive/sandbox/ */
-#include "sandbox.h"
+#include "../sandbox/sandbox.h"
 #endif