PR:

Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193229 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile b/Makefile
index 1583f37ca08473959da7c8300cd0f46f0d830140..2b98fe65839d9273d0f0281ca001b463bb1569f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,8 +60,8 @@ compilegen: properties charlist fonts
        cd $(GENDIR) && \
        ($(FIND) . -name \*.java -print > javafiletoc) && \
        for javafile in `cat javafiletoc` ; do \
-               echo $(JAVAC) $(JAVAC_ARGS) $$javafile ;\
-               $(JAVAC) $(JAVAC_ARGS) $$javafile ;\
+               echo $(JAVAC) $(GEN_JAVAC_ARGS) $$javafile ;\
+               $(JAVAC) $(GEN_JAVAC_ARGS) $$javafile ;\
        done
 
 $(GENDIR): 
@@ -95,9 +95,10 @@ distgen:
        ($(TAR) -cf - -T $(JARTOC) | (cd ../$(JARTEMP); $(TAR) -xf - )) 
 
 distorg:
+       cd src && \
        rm -f $(JARTOC) && \
-       ($(FIND) src/org -name \*.class -print > $(JARTOC)) && \
-       ($(TAR) -cf - -T $(JARTOC) | (cd $(JARTEMP); $(TAR) -xf - ))
+       ($(FIND) org -name \*.class -print > $(JARTOC)) && \
+       ($(TAR) -cf - -T $(JARTOC) | (cd ../$(JARTEMP); $(TAR) -xf - ))
 
 $(TARGETS:%=%subs): %subs :
        for dir in $(SUBDIRS) ; do \

diff --git a/Makefile.rules b/Makefile.rules
index c3ac5ff65a6c4585e1874c4441e3d3fe3f0dc307..a6f87dc0000221e327da3b50012582409db53b31 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -9,6 +9,7 @@ JAVAC = javac
 
 # following class path is for CygWin bash
 JAVAC_ARGS = -g:none -classpath "$(BASEDIR)/src;$(BASEDIR)/generated;$(CLASSPATH)"
+GEN_JAVAC_ARGS = -g:none -classpath "../src;$(CLASSPATH)"
 
 FIND=find
 TAR=tar

diff --git a/STATUS b/STATUS
index 27f3c54847fae1cb9f68a5b5b23af06cc1c5d0e6..5d99dca815819c8bbc994b51fbe59f3274b8d665 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -2,6 +2,8 @@ $Id$
 
 STATUS
 
-Transition to xml.apache.org isn't complete yet
-Makefiles don't fully work
+Things to do before releasing as 0.12.0:
+
+Make sure Makefiles work
+Get images working