Commits

Jon Tibble  committed d704b19

Cleanup make install

  • Participants
  • Parent commits 8ec8ea5

Comments (0)

Files changed (6)

File components/grails/Makefile

 # workaround for bug 6734267 (pkgmk does not allow spaces in file names)
 # the following files are not used directly by Grails framework...
 $(INSTALL_32):	$(BUILD_32)
-	(cd $(COMPONENT_SRC)/media/icons ; \
+	(cd $(BUILD_DIR_32)/media/icons ; \
 		mv 'grails - 16x16 icon.png' grails-16x16icon.png ; \
 		mv 'grails - 32x32 icon.png' grails-32x32icon.png ; \
 		mv 'grails - 48x48 icon.png' grails-48x48icon.png ; \

File components/httping/Makefile

 COMPONENT_BUILD_ARGS +=	CFLAGS="$(CFLAGS) -Dstrndup=strndup -DVERSION=\\\"$(COMPONENT_VERSION)\\\""
 COMPONENT_BUILD_ARGS +=	LDFLAGS="$(LDFLAGS) -lsocket -lnsl -lssl -lcrypto"
 COMPONENT_BUILD_ENV += CC="$(CC)"
+COMPONENT_INSTALL_ENV += INSTALL="ginstall"
 
 # common targets
 build:		$(BUILD_32)

File components/httping/patches/Makefile.patch

---- httping-1.4.4/Makefile	Sat Jul 24 03:32:07 2010
-+++ httping-1.4.4/Makefile.new	Fri Jul 15 09:54:53 2011
+--- httping-1.4.4/Makefile.~1~	2010-07-24 11:32:07.000000000 +0100
++++ httping-1.4.4/Makefile	2012-10-09 11:10:31.528697583 +0100
 @@ -16,7 +16,7 @@
  
  TARGET=httping
  OFLAGS=-O2
  CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
  
+@@ -26,7 +26,6 @@
+ MANDIR=$(PREFIX)/share/man
+ DOCDIR=$(PREFIX)/share/doc/$(TARGET)
+ 
+-INSTALL=install
+ INSTALLDIR=$(INSTALL) -m 0755 -d
+ INSTALLBIN=$(INSTALL) -m 0755
+ INSTALLMAN=$(INSTALL) -m 0644

File components/libidn/Makefile

 # to force re-generation of the TLD tables after augmenting them
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	( cd $(SOURCE_DIR) ; \
-	    $(CP) $(COMPONENT_DIR)/tld-0.7.tar.gz . ; \
+	    $(CP) $(USERLAND_ARCHIVES)/tld-0.7.tar.gz . ; \
 	    $(GUNZIP) tld-0.7.tar.gz ; \
 	    $(TAR) xvf tld-0.7.tar > /dev/null 2>&1 ; \
 	    $(RM) tld-0.7.tar ; \
 install: $(INSTALL_32_and_64)
 	$(MKDIR) $(HTMLDOCDIR) ; \
 	list1='$(HTMLDOCLIST)' ; for f in $$list1; do \
-	    $(INSTALL) -m 0644 $(COMPONENT_DIR)/$(COMPONENT_SRC)/doc/$$f \
-	    $(HTMLDOCDIR)/ ; \
+	    $(INSTALL) -m 0644 $(SOURCE_DIR)/doc/$$f $(HTMLDOCDIR)/ ; \
 	    done
 	list2='$(DOCLIST)' ; for f in $$list2; do \
-	      $(INSTALL) -m 0644 $(COMPONENT_DIR)/$(COMPONENT_SRC)/doc/$$f \
-	      $(IDNDOCDIR)/ ; \
+	      $(INSTALL) -m 0644 $(SOURCE_DIR)/doc/$$f $(IDNDOCDIR)/ ; \
 	      done
-	$(CP) -Rp $(COMPONENT_DIR)/$(COMPONENT_SRC)/doc/java \
-	    $(IDNDOCDIR)/ ; \
-	$(CP) -Rp $(COMPONENT_DIR)/$(COMPONENT_SRC)/tld \
-	    $(IDNDOCDIR)/
+	$(CP) -Rp $(SOURCE_DIR)/doc/java $(IDNDOCDIR)/ ; \
+	$(CP) -Rp $(SOURCE_DIR)/tld $(IDNDOCDIR)/
 	$(CP) -Rp $(PROTOUSRSHAREDIR)/locale/en@boldquot \
 	    $(PROTOUSRSHAREDIR)/locale/en
 

File components/nethack/Makefile

 COMPONENT_PREP_ACTION= (cd $(SOURCE_DIR)/sys/unix ; sh setup.sh)
 
 COMPONENT_BUILD_ENV += CC="$(SPRO_VROOT)/bin/cc"
+COMPONENT_INSTALL_ENV += CC="$(SPRO_VROOT)/bin/cc"
 
 COMPONENT_INSTALL_ARGS += CHOWN=true
 COMPONENT_INSTALL_ARGS += CHGRP=true
 install:	$(INSTALL_32)
 	sed -e 's/^!\(NetHack.tomb\)/\1/' -e 's/^!\(NetHack.pet\)/\1/' \
 		-e 's/^!\(NetHack.tile_file\)/\1/' \
-		$(COMPONENT_SRC)/win/X11/NetHack.ad \
+		$(BUILD_DIR_32)/win/X11/NetHack.ad \
 		> $(PROTO_DIR)/usr/lib/nethack/NetHack.ad
 
 test:		$(NO_TESTS)

File components/perl/perl512/Makefile

 # perl's config.
 #
 COMPONENT_BUILD_ENV	+=	PATH=$(dir $(CC.studio.32)):$(PATH)
+COMPONENT_INSTALL_ENV	+=	PATH=$(dir $(CC.studio.32)):$(PATH)
 
 build:		$(BUILD_32)