Fix symlinks when building a new tree outside the source tree.

diff --git a/lustre/llite/Makefile.am b/lustre/llite/Makefile.am
index 38e478d..4ce382f 100644 (file)
--- a/lustre/llite/Makefile.am
+++ b/lustre/llite/Makefile.am
@@ -10,7 +10,7 @@ modulefs_DATA = llite.o
 EXTRA_PROGRAMS = llite
 
 page.c: 
-       -ln -s ../lib/page.c
+       test -e page.c || ln -sf $(top_srcdir)/lib/page.c
 
 
 LINX=page.c

diff --git a/lustre/mdc/Makefile.am b/lustre/mdc/Makefile.am
index 1595d3d..4069f6b 100644 (file)
--- a/lustre/mdc/Makefile.am
+++ b/lustre/mdc/Makefile.am
@@ -13,7 +13,7 @@ LINX=mds_updates.c
 mdc_SOURCES =  mdc_request.c mdc_reint.c $(LINX)
 
 mds_updates.c: 
-       ln -s ../lib/mds_updates.c .
+       test -e mds_updates.c || ln -sf $(top_srcdir)/lib/mds_updates.c .
 
 dist-hook:
        list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done

diff --git a/lustre/mds/Makefile.am b/lustre/mds/Makefile.am
index 5f676fc..2885bf4 100644 (file)
--- a/lustre/mds/Makefile.am
+++ b/lustre/mds/Makefile.am
@@ -11,9 +11,10 @@ EXTRA_PROGRAMS = mds
 
 LINX=mds_updates.c simple.c
 mds_updates.c: 
-       ln -s ../lib/mds_updates.c .
+       test -e mds_updates.c || ln -sf $(top_srcdir)/lib/mds_updates.c
+
 simple.c: 
-       ln -s ../lib/simple.c .
+       test -e simple.c || ln -sf $(top_srcdir)/lib/simple.c
 
 mds_SOURCES = handler.c mds_reint.c mds_ext2.c mds_ext3.c $(LINX)
 

diff --git a/lustre/obdfilter/Makefile.am b/lustre/obdfilter/Makefile.am
index 4567bb9..f4c98f7 100644 (file)
--- a/lustre/obdfilter/Makefile.am
+++ b/lustre/obdfilter/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_PROGRAMS = obdfilter
 
 LINX=simple.c
 simple.c: 
-       ln -s ../lib/simple.c .
+       test -e simple.c || ln -sf $(top_srcdir)/lib/simple.c
 
 EXT2C = filter.c
 obdfilter_SOURCES = filter.c $(LINX)

diff --git a/lustre/osc/Makefile.am b/lustre/osc/Makefile.am
index 30d518b..d3e3be8 100644 (file)
--- a/lustre/osc/Makefile.am
+++ b/lustre/osc/Makefile.am
@@ -13,7 +13,7 @@ LINX= obd_pack.c
 osc_SOURCES =  obd_pack.c osc_request.c # super.c rw.c file.c dir.c sysctl.c super.c namei.c symlink.c
 
 obd_pack.c: 
-       ln -s ../lib/obd_pack.c .
+       test -e obd_pack.c || ln -sf $(top_srcdir)/lib/obd_pack.c
 
 dist-hook:
        list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done

diff --git a/lustre/ost/Makefile.am b/lustre/ost/Makefile.am
index 5a355b9..4189e5f 100644 (file)
--- a/lustre/ost/Makefile.am
+++ b/lustre/ost/Makefile.am
@@ -10,9 +10,10 @@ EXTRA_PROGRAMS = ost
 
 LINX=page.c obd_pack.c
 obd_pack.c: 
-       ln -s ../lib/obd_pack.c .
+       test -e obd_pack.c || ln -sf $(top_srcdir)/lib/obd_pack.c
+
 page.c:
-       ln -s ../lib/page.c
+       test -e page.c || ln -sf $(top_srcdir)/lib/page.c
 
 ost_SOURCES = $(LINX) ost_handler.c
 dist-hook: