install in different dir for javadocs

chaos · Aug 27, 2012 · 01ca53d · 01ca53d
1 parent 7f0f7f6
commit 01ca53d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/genders.spec.in b/genders.spec.in
@@ -64,8 +64,8 @@ DESTDIR="$RPM_BUILD_ROOT" make install
 %defattr(-,root,root)
 %doc README NEWS ChangeLog DISCLAIMER DISCLAIMER.UC COPYING TUTORIAL genders.sample
 %if %{?_with_java_extensions:1}%{!?_with_java_extensions:0}
-%dir %{_datadir}/doc/%{name}-javadoc/
-%doc %{_datadir}/doc/%{name}-javadoc/*
+%dir %{_datadir}/doc/%{name}-%{version}-javadoc/
+%doc %{_datadir}/doc/%{name}-%{version}-javadoc/*
 %endif
 # It doesn't matter if the user chooses a 32bit or 64bit target.  The
 # packaging must work off whatever Perl is installed.  

diff --git a/src/extensions/java/Makefile.am b/src/extensions/java/Makefile.am
@@ -39,9 +39,9 @@ genders_header: all
 install-data-local: all
 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/java
 	$(INSTALL) -m 644 $(builddir)/gov/llnl/lc/chaos/Genders.jar $(DESTDIR)$(datadir)/java
-	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)-javadoc/
+	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)-$(VERSION)-javadoc/
 # achu: Not sure of recursive install command, is there one?
-	cp -r javadoc/* $(DESTDIR)$(docdir)-javadoc
+	cp -r javadoc/* $(DESTDIR)$(docdir)-$(VERSION)-javadoc
 
 uninstall:
 	$(RM) -f $(DESTDIR)$(datadir)/java/Genders.jar