You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
110 lines
5.0 KiB
110 lines
5.0 KiB
Index: builds/unix/freetype-config.in |
|
--- builds/unix/freetype-config.in.orig 2003-04-24 07:45:59.000000000 +0200 |
|
+++ builds/unix/freetype-config.in 2003-11-10 09:15:43.000000000 +0100 |
|
@@ -79,7 +79,7 @@ |
|
fi |
|
|
|
if test "$echo_cflags" = "yes" ; then |
|
- cflags="-I@includedir@/freetype2" |
|
+ cflags="-I@includedir@" |
|
if test "@includedir@" != "/usr/include" ; then |
|
echo $cflags -I@includedir@ |
|
else |
|
Index: builds/unix/freetype2.in |
|
--- builds/unix/freetype2.in.orig 2003-06-01 23:30:03.000000000 +0200 |
|
+++ builds/unix/freetype2.in 2003-11-10 09:15:43.000000000 +0100 |
|
@@ -8,4 +8,4 @@ |
|
Version: @ft_version@ |
|
Requires: |
|
Libs: -L${libdir} -lfreetype @LIBZ@ |
|
-Cflags: -I${includedir}/freetype2 |
|
+Cflags: -I${includedir} |
|
Index: builds/unix/install.mk |
|
--- builds/unix/install.mk.orig 2003-11-09 09:37:13.000000000 +0100 |
|
+++ builds/unix/install.mk 2003-11-10 09:16:36.000000000 +0100 |
|
@@ -26,33 +26,33 @@ |
|
install: $(PROJECT_LIBRARY) |
|
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ |
|
$(DESTDIR)$(libdir)/pkgconfig \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/config \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/internal \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/cache \ |
|
+ $(DESTDIR)$(includedir)/freetype/config \ |
|
+ $(DESTDIR)$(includedir)/freetype/internal \ |
|
+ $(DESTDIR)$(includedir)/freetype/cache \ |
|
$(DESTDIR)$(bindir) \ |
|
$(DESTDIR)$(datadir)/aclocal |
|
$(LIBTOOL) --mode=install $(INSTALL) \ |
|
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir) |
|
-for P in $(PUBLIC_H) ; do \ |
|
$(INSTALL_DATA) \ |
|
- $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \ |
|
+ $$P $(DESTDIR)$(includedir)/freetype ; \ |
|
done |
|
-for P in $(BASE_H) ; do \ |
|
$(INSTALL_DATA) \ |
|
- $$P $(DESTDIR)$(includedir)/freetype2/freetype/internal ; \ |
|
+ $$P $(DESTDIR)$(includedir)/freetype/internal ; \ |
|
done |
|
-for P in $(CONFIG_H) ; do \ |
|
$(INSTALL_DATA) \ |
|
- $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \ |
|
+ $$P $(DESTDIR)$(includedir)/freetype/config ; \ |
|
done |
|
-for P in $(CACHE_H) ; do \ |
|
$(INSTALL_DATA) \ |
|
- $$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \ |
|
+ $$P $(DESTDIR)$(includedir)/freetype/cache ; \ |
|
done |
|
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \ |
|
$(DESTDIR)$(includedir)/ft2build.h |
|
$(INSTALL_DATA) $(BUILD_DIR)/ftconfig.h \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h |
|
+ $(DESTDIR)$(includedir)/freetype/config/ftconfig.h |
|
$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ |
|
$(DESTDIR)$(bindir)/freetype-config |
|
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \ |
|
@@ -63,15 +63,15 @@ |
|
|
|
uninstall: |
|
-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A |
|
- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/* |
|
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache |
|
- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/* |
|
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config |
|
- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/* |
|
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal |
|
- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/* |
|
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype |
|
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 |
|
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/cache/* |
|
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/cache |
|
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/config/* |
|
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/config |
|
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/internal/* |
|
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/internal |
|
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/* |
|
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype |
|
+ -$(DELDIR) $(DESTDIR)$(includedir) |
|
-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h |
|
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config |
|
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4 |
|
Index: include/freetype/freetype.h |
|
--- include/freetype/freetype.h.orig 2003-11-09 09:38:13.000000000 +0100 |
|
+++ include/freetype/freetype.h 2003-11-10 09:15:43.000000000 +0100 |
|
@@ -16,15 +16,6 @@ |
|
/***************************************************************************/ |
|
|
|
|
|
-#ifndef FT_FREETYPE_H |
|
-#error "`ft2build.h' hasn't been included yet!" |
|
-#error "Please always use macros to include FreeType header files." |
|
-#error "Example:" |
|
-#error " #include <ft2build.h>" |
|
-#error " #include FT_FREETYPE_H" |
|
-#endif |
|
- |
|
- |
|
#ifndef __FREETYPE_H__ |
|
#define __FREETYPE_H__ |
|
|
|
|