mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
130 lines
3.8 KiB
Plaintext
130 lines
3.8 KiB
Plaintext
From 8c9e52cb61558d1889cbe8692474bc64c60a7f3a Mon Sep 17 00:00:00 2001
|
|
From: Scott McCreary <scottmc2@gmail.com>
|
|
Date: Mon, 23 May 2011 16:13:13 +0000
|
|
Subject: Fixed directories for htmldoc.
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index d9df2bc..3cb6bff 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -99,7 +99,7 @@ AC_SUBST(LDFLAGS)
|
|
|
|
AC_CHECK_LIB(m,pow)
|
|
AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL))
|
|
-AC_SEARCH_LIBS(socket, socket)
|
|
+AC_SEARCH_LIBS(socket, network socket)
|
|
AC_SEARCH_LIBS(gethostbyaddr, nsl)
|
|
AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
|
|
AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
|
|
diff --git a/data/Makefile b/data/Makefile
|
|
index 2c2143a..e63af35 100644
|
|
--- a/data/Makefile
|
|
+++ b/data/Makefile
|
|
@@ -41,11 +41,11 @@ all:
|
|
#
|
|
|
|
install:
|
|
- if [ ! -d $(datadir)/htmldoc/data ]; then\
|
|
- $(MKDIR) $(datadir)/htmldoc/data;\
|
|
+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
|
|
+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
|
|
fi
|
|
- $(CP) $(FILES) $(datadir)/htmldoc/data
|
|
- $(CHMOD) ugo+r $(datadir)/htmldoc/data/*
|
|
+ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
|
|
+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
|
|
|
|
|
|
#
|
|
diff --git a/doc/Makefile b/doc/Makefile
|
|
index 138af77..60bfc82 100644
|
|
--- a/doc/Makefile
|
|
+++ b/doc/Makefile
|
|
@@ -45,16 +45,16 @@ all: $(DOCUMENTS)
|
|
#
|
|
|
|
install: $(DOCUMENTS)
|
|
- if test ! -d $(datadir)/doc/htmldoc; then\
|
|
- $(MKDIR) $(datadir)/doc/htmldoc;\
|
|
+ if [ ! -d $(DESTDIR)$(mandir)/doc/htmldoc ]; then\
|
|
+ $(MKDIR) $(DESTDIR)$(mandir)/doc/htmldoc;\
|
|
+ fi
|
|
+ $(CP) $(DOCFILES) $(DESTDIR)/$(mandir)/doc/htmldoc
|
|
+ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/doc/htmldoc/*
|
|
+ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\
|
|
+ $(MKDIR) $(DESTDIR)/$(mandir)/man1;\
|
|
fi
|
|
- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc
|
|
- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
|
|
- if test ! -d $(mandir)/man1; then\
|
|
- $(MKDIR) $(mandir)/man1;\
|
|
- fi
|
|
- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1
|
|
- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
|
|
+ $(CP) htmldoc.man $(DESTDIR)/$(mandir)/man1/htmldoc.1
|
|
+ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/man1/htmldoc.1
|
|
|
|
|
|
#
|
|
diff --git a/fonts/Makefile b/fonts/Makefile
|
|
index 980fc93..a01bc7a 100644
|
|
--- a/fonts/Makefile
|
|
+++ b/fonts/Makefile
|
|
@@ -63,14 +63,14 @@ all:
|
|
|
|
install:
|
|
echo "Installing font files in $(datadir)/htmldoc/fonts..."
|
|
- if [ ! -d $(datadir)/htmldoc/fonts ]; then\
|
|
- $(MKDIR) $(datadir)/htmldoc/fonts;\
|
|
+ if [ ! -d $(DESTDIR)/$(datadir)/htmldoc/fonts ]; then\
|
|
+ $(MKDIR) $(DESTDIR)/$(datadir)/htmldoc/fonts;\
|
|
fi
|
|
for font in $(FONTS); do \
|
|
- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \
|
|
- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
|
|
+ $(CP) $$font.afm $(DESTDIR)/$(datadir)/htmldoc/fonts; \
|
|
+ $(CP) $$font.pfa $(DESTDIR)/$(datadir)/htmldoc/fonts; \
|
|
done
|
|
- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
|
|
+ $(CHMOD) ugo+r $(DESTDIR)/$(datadir)/htmldoc/fonts/*
|
|
|
|
|
|
#
|
|
diff --git a/htmldoc/Makefile b/htmldoc/Makefile
|
|
index 3f56d20..4789a0c 100644
|
|
--- a/htmldoc/Makefile
|
|
+++ b/htmldoc/Makefile
|
|
@@ -38,11 +38,11 @@ all: htmldoc$(EXEEXT)
|
|
#
|
|
|
|
install: all
|
|
- if [ ! -d $(bindir) ]; then\
|
|
- $(MKDIR) $(bindir);\
|
|
+ if [ ! -d $(DESTDIR)/$(bindir) ]; then\
|
|
+ $(MKDIR) $(DESTDIR)/$(bindir);\
|
|
fi
|
|
- cp htmldoc$(EXEEXT) $(bindir)
|
|
- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
|
|
+ cp htmldoc$(EXEEXT) $(DESTDIR)/$(bindir)
|
|
+ chmod ugo+rx $(DESTDIR)/$(bindir)/htmldoc$(EXEEXT)
|
|
|
|
|
|
#
|
|
diff --git a/htmldoc/http.h b/htmldoc/http.h
|
|
index e6ac676..da39aa7 100644
|
|
--- a/htmldoc/http.h
|
|
+++ b/htmldoc/http.h
|
|
@@ -86,6 +86,8 @@ extern "C" {
|
|
# define s6_addr32 _S6_un._S6_u32
|
|
# elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)|| defined(__DragonFly__)
|
|
# define s6_addr32 __u6_addr.__u6_addr32
|
|
+# elif defined(__HAIKU__)
|
|
+# define s6_addr32 s6_addr
|
|
# elif defined(WIN32)
|
|
/*
|
|
* Windows only defines byte and 16-bit word members of the union and
|
|
--
|
|
2.2.2
|
|
|