summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--src/org/apache/fop/layout/LineArea.java2
-rw-r--r--src/org/apache/fop/pdf/PDFXObject.java2
-rw-r--r--src/org/apache/fop/render/xml/XMLRenderer.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 27f51a087..1583f37ca 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ distgen:
distorg:
rm -f $(JARTOC) && \
- ($(FIND) org -name \*.class -print > $(JARTOC)) && \
+ ($(FIND) src/org -name \*.class -print > $(JARTOC)) && \
($(TAR) -cf - -T $(JARTOC) | (cd $(JARTEMP); $(TAR) -xf - ))
$(TARGETS:%=%subs): %subs :
diff --git a/src/org/apache/fop/layout/LineArea.java b/src/org/apache/fop/layout/LineArea.java
index 7ac928800..ff2b4e2f9 100644
--- a/src/org/apache/fop/layout/LineArea.java
+++ b/src/org/apache/fop/layout/LineArea.java
@@ -270,7 +270,7 @@ public class LineArea extends Area {
char d =
- org.apache.xml.fop.render.pdf.CodePointMapping.map[c];
+ org.apache.fop.render.pdf.CodePointMapping.map[c];
if (d != 0) {
diff --git a/src/org/apache/fop/pdf/PDFXObject.java b/src/org/apache/fop/pdf/PDFXObject.java
index ab92c5df6..279cb37a5 100644
--- a/src/org/apache/fop/pdf/PDFXObject.java
+++ b/src/org/apache/fop/pdf/PDFXObject.java
@@ -64,7 +64,7 @@ import java.io.PrintWriter;
// shouldn't have to do this
-import org.apache.xml.fop.image.*;
+import org.apache.fop.image.*;
diff --git a/src/org/apache/fop/render/xml/XMLRenderer.java b/src/org/apache/fop/render/xml/XMLRenderer.java
index 875e6b075..2cfcee908 100644
--- a/src/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/org/apache/fop/render/xml/XMLRenderer.java
@@ -288,7 +288,7 @@ public class XMLRenderer implements Renderer {
/* use PDF's font setup to get PDF metrics */
- org.apache.xml.fop.render.pdf.FontSetup.setup(fontInfo);
+ org.apache.fop.render.pdf.FontSetup.setup(fontInfo);
}