Minor fixes.

25 years ago · 4af2f18cc3
parent a82cd844fb
commit 4af2f18cc3
5 changed files with 7 additions and 4 deletions
--- 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)
--- 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:
--- a/builds/unix/.cvsignore
+++ b/builds/unix/.cvsignore
@ -5,3 +5,4 @@ config.cache
 config.log
 libtool
 ftconfig.h
+freetype-config
--- 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)
--- 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: