diff options
Diffstat (limited to 'jfreereport/java/libfonts/makefile.mk')
| -rw-r--r-- | jfreereport/java/libfonts/makefile.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk index 594562d69db9..cffe2a999f12 100644 --- a/jfreereport/java/libfonts/makefile.mk +++ b/jfreereport/java/libfonts/makefile.mk @@ -25,7 +25,7 @@ # #************************************************************************* -PRJ=..$/.. +PRJ=../.. PRJNAME=jfreereport TARGET=libfonts @@ -34,7 +34,7 @@ TARGET=libfonts .INCLUDE : settings.mk .INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk +.INCLUDE : $(PRJ)/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- @@ -42,7 +42,7 @@ TARGET=libfonts TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION) TARFILE_IS_FLAT=true TARFILE_MD5=3bdf40c0d199af31923e900d082ca2dd -PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBFONTS_VERSION)-deprecated.patch CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" @@ -63,15 +63,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar +ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar -$(PACKAGE_DIR)$/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy - -$(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar +$(PACKAGE_DIR)/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy + +$(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar .ENDIF .ENDIF |