CoreOSMakefiles-75.tar.gz

diff --git a/ReleaseControl/Common.make b/ReleaseControl/Common.make
index f6bffeb7c4b335a7dfd6ec8e55af0495f16582dd..b874c4201256badc57b7ccc0a4c94d4009620876 100644 (file)
--- a/ReleaseControl/Common.make
+++ b/ReleaseControl/Common.make
@@ -107,19 +107,13 @@ ManPageDirectories = /usr/share/man
 # Targets
 ##
 
 # Targets
 ##
 

-.PHONY: all install installhdrs install_headers lazy_installsrc lazy_install_source installsrc install_source build clean recurse _targetconfig
+.PHONY: all install installhdrs install_headers lazy_installsrc lazy_install_source installsrc install_source build clean recurse

 
 all: build
 
 $(DSTROOT): install
 
 
 all: build
 
 $(DSTROOT): install
 

-install:: _targetconfig install_headers build
-
-_targetconfig::
-       @PRODUCT="`tconf --product 2>/dev/null`" ; \
-       if [ -z "$$PRODUCT" ]; then \
-       echo "Error: TargetConfig not defined" ; exit 1 ; \
-       else echo "TargetConfig: $$PRODUCT" ; fi
+install:: install_headers build

 
 # For RC
 installhdrs:: install_headers
 
 # For RC
 installhdrs:: install_headers

diff --git a/Standard/Commands.in b/Standard/Commands.in
index a6acf6905b5b9819908cc1769373b8729b4000ac..bf88540b35b91d69c705001150d9c1ad870dd99e 100644 (file)
--- a/Standard/Commands.in
+++ b/Standard/Commands.in
@@ -282,7 +282,6 @@ PACKAGE   = /usr/bin/package
 # Miscellaneous
 ##
 ARCH        = /usr/bin/arch
 # Miscellaneous
 ##
 ARCH        = /usr/bin/arch

-COMPRESSMANPAGES = $(MAKEFILEPATH)/bin/compress-man-pages.pl -d $(DSTROOT)

 ECHO        = echo
 FALSE       = /usr/bin/false
 PLUTIL      = /usr/bin/plutil
 ECHO        = echo
 FALSE       = /usr/bin/false
 PLUTIL      = /usr/bin/plutil

diff --git a/bin/compress-man-pages.pl b/bin/compress-man-pages.pl
deleted file mode 100755 (executable)
index 1ca8670..0000000
--- a/bin/compress-man-pages.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-# Copyright (c) 2011 Apple Inc. All rights reserved.
-#
-# @APPLE_LICENSE_HEADER_START@
-# 
-# This file contains Original Code and/or Modifications of Original Code
-# as defined in and that are subject to the Apple Public Source License
-# Version 2.0 (the 'License'). You may not use this file except in
-# compliance with the License. Please obtain a copy of the License at
-# http://www.opensource.apple.com/apsl/ and read it before using this
-# file.
-# 
-# The Original Code and all software distributed under the License are
-# distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-# EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-# Please see the License for the specific language governing rights and
-# limitations under the License.
-# 
-# @APPLE_LICENSE_HEADER_END@
-
-# <rdar://problem/9910865> man pages should not be compressed
-printf "compress-man-pages.pl is now a nop.  Please remove it from your build script.\n";