[openbsd] Remove gnuisms from icedtea-web's Makefile.in, and fix install calls

[Deepak Bhole]

* Dr Andrew John Hughes <ahughes at redhat.com> [2011-08-24 19:50]:
> On 16:51 Wed 24 Aug     , Deepak Bhole wrote:
> > * Landry Breuil <landry at openbsd.org> [2011-08-23 08:14]:
> > > Hi,
> > > 
> > > just a quick note to let you know that icedtea-web 1.1.1 works fine on
> > > OpenBSD with sun's openjdk 1.7 (with the applet_hole.patch). I just had
> > > to apply a little (attached patch) :
> > > - cp -a is a gnu cp option, don't use it
> > > - install -D is a gnu install option, add a plain install -d call to
> > >   create the parent dirs
> > > - on OpenBSD, INSTALL_DATA is set by the ports infrastructure and uses
> > >   -o/-g by default, as it's supposed to be used during make install
> > > (which is run as root). For the 'stamp files', icedtea-web calls
> > > INSTALL_DATA during make step, which is run as regular user, thus
> > > install -o/-g fails. Hence, use a plain install -c -m 644 command
> > > instead of relying on INSTALL_DATA.
> > > 
> > > There are more hunks in that patch, but they're openbsd-specific so i'm
> > > not pushing them. We'll soon ship icedtea-web in our ports-tree.
> > > 
> > > Landry
> > 
> > Thanks for the patch!
> > 
> > I assume you meant to make the changes to Makefile.am? Anyway, I made it
> > so but I found some issues on Linux. Specifically, the doc dirs don't
> > get created without the -D.
> > 
> 
> Well, yes because -d just creates directories while -D installs files,
> creating any directories needed.
> 
> Are you sure the patch below works by just removing -D? Are you trying
> the install on a clean tree?  It's not obvious to me how netx gets
> created.
> Bare install shouldn't be used; use ${INSTALL}.

Fixed.

> Also you seem to be removing all the INSTALL_DATA targets whereas it's
> just the usage in each of netx and extra-class-files that's at
> issue.
> 

It is only removed where -D is used (4 places).

> cp -p is closer to the status quo than just reverting to cp.
> 

Fixed.

> Have you tested this with make distcheck?
> 

It is broken in HEAD, but not as a consequence of this patch.

It works for 1.1.

Thanks for reviewing! New patch attached. Okay for commit?

Cheers,
Deepak
-------------- next part --------------
diff -r 7afd916031fa Makefile.am
--- a/Makefile.am	Mon Aug 29 17:02:36 2011 -0400
+++ b/Makefile.am	Wed Aug 31 12:59:17 2011 -0400
@@ -168,13 +168,15 @@
 	(cd ${abs_top_builddir}/docs/netx; \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
+	   ${INSTALL} -d $$(dirname "$(DESTDIR)$(htmldir)/netx/$${files}"); \
+	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
 	 done)
 if ENABLE_PLUGIN
 	(cd ${abs_top_builddir}/docs/plugin; \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
+	   ${INSTALL} -d $$(dirname "$(DESTDIR)$(htmldir)/plugin/$${files}"); \
+	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
 	 done)
 endif
 endif
@@ -304,14 +306,15 @@
 	    -bootclasspath $(RUNTIME) \
 	    @netx-source-files.txt
 	(cd $(NETX_RESOURCE_DIR); \
+	 ${INSTALL} -d $(NETX_DIR)/net/sourceforge/jnlp/resources/ ; \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} \
+	   ${INSTALL} -c -m 644 $${files} \
 	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
 	 done)
-	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
+	cp -p $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
 	  $(NETX_DIR)/net/sourceforge/jnlp/runtime
-	cp -a build.properties $(NETX_DIR)/net/sourceforge/jnlp/
+	cp -p build.properties $(NETX_DIR)/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch $@
 
@@ -347,9 +350,10 @@
           -sourcepath $(abs_top_srcdir)/extra -cp netx.build \
           -bootclasspath $(RUNTIME) @extra-source-files.txt
 	(cd $(NETX_EXTRA_DIR); \
+	 ${INSTALL} -d $(NETX_EXTRA_DIST_DIR) ; \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} \
+	   ${INSTALL} -c -m 644 $${files} \
 	   $(NETX_EXTRA_DIST_DIR)/$${files}; \
 	 done)
 	mkdir -p stamps