Minor fixes.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/builds/cygwin/freetype-config.in b/builds/cygwin/freetype-config.in
index 8575a07..b32b126 100644
--- a/builds/cygwin/freetype-config.in
+++ b/builds/cygwin/freetype-config.in
@@ -44,7 +44,7 @@ while test $# -gt 0; do
echo_exec_prefix=yes
;;
--version)
- echo @VERSION@
+ echo @version_info@
exit 0
;;
--cflags)
diff --git a/builds/cygwin/install.mk b/builds/cygwin/install.mk
index fb5e98e..938ac78 100644
--- a/builds/cygwin/install.mk
+++ b/builds/cygwin/install.mk
@@ -33,7 +33,8 @@ install: $(PROJECT_LIBRARY)
-for P in $(CACHE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype2/freetype/cache ; \
done
- $(INSTALL) -m a+x $(BUILD)/freetype-config $(bindir)/freetype-config
+ $(INSTALL_SCRIPT) -m 755 $(BUILD)/freetype-config \
+ $(bindir)/freetype-config
uninstall:
diff --git a/builds/unix/.cvsignore b/builds/unix/.cvsignore
index e76c25d..cc8ec6a 100644
--- a/builds/unix/.cvsignore
+++ b/builds/unix/.cvsignore
@@ -5,3 +5,4 @@ config.cache
config.log
libtool
ftconfig.h
+freetype-config
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index 8575a07..b32b126 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -44,7 +44,7 @@ while test $# -gt 0; do
echo_exec_prefix=yes
;;
--version)
- echo @VERSION@
+ echo @version_info@
exit 0
;;
--cflags)
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 78b3dfc..0b07072 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -33,7 +33,8 @@ install: $(PROJECT_LIBRARY)
-for P in $(CACHE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype2/freetype/cache ; \
done
- $(INSTALL) -m a+x $(BUILD)/freetype-config $(bindir)/freetype-config
+ $(INSTALL_SCRIPT) -m 755 $(BUILD)/freetype-config \
+ $(bindir)/freetype-config
uninstall: