[PATCH] Only build datadir.h after configure is run

[Cole Robinson]

Force building this file breaks make && sudo make install with NFS and
root squash.

Signed-off-by: Cole Robinson 
---
 src/Makefile.am |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4c6b734..9d8a3d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,10 +54,7 @@ netcf.syms: netcf_public.syms netcf_private.syms
 # Generate datadir.h. That's where we look for stylesheets
 internal.h: datadir.h

-FORCE-datadir.h: Makefile
-	echo '#define DATADIR "$(datadir)"' > datadir.h1
-	$(top_srcdir)/build/aux/move-if-change datadir.h1 datadir.h
-
-datadir.h: FORCE-datadir.h
+datadir.h: $(top_builddir)/config.status
+	echo '#define DATADIR "$(datadir)"' > datadir.h

DISTCLEANFILES += $(BUILT_SOURCES)

[Laine Stump]

On 06/15/2010 12:25 AM, Cole Robinson wrote:
> Force building this file breaks make&&  sudo make install with NFS and
> root squash.
> Signed-off-by: Cole Robinson
>
> src/Makefile.am |    7 ++-----
>   1 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 4c6b734..9d8a3d7 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -54,10 +54,7 @@ netcf.syms: netcf_public.syms netcf_private.syms
>   # Generate datadir.h. That's where we look for stylesheets
>   internal.h: datadir.h
>
> -FORCE-datadir.h: Makefile
> echo '#define DATADIR "$(datadir)"'>  datadir.h1
> $(top_srcdir)/build/aux/move-if-change datadir.h1 datadir.h
>
> -datadir.h: FORCE-datadir.h
> +datadir.h: $(top_builddir)/config.status
>
> echo '#define DATADIR "$(datadir)"'>  datadir.h
>
> DISTCLEANFILES += $(BUILT_SOURCES)

ACK. Pushed.