X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Fasdf-install%2Fasdf-install.asd;h=3ee25d38ed4fc456bb9a37bec29e9506344b1ab7;hb=5f891793819e3cd714c443c9a0a7223b4fb13dd0;hp=cdcec0a910ab02d6521a732d56fcf804c3ce5540;hpb=08e218c9bd9fdfb1e4dcc5f5e245feea17762471;p=sbcl.git

diff --git a/contrib/asdf-install/asdf-install.asd b/contrib/asdf-install/asdf-install.asd
index cdcec0a..3ee25d3 100644
--- a/contrib/asdf-install/asdf-install.asd
+++ b/contrib/asdf-install/asdf-install.asd
@@ -1,35 +1,10 @@
 ;;; -*-  Lisp -*-
-
-(defpackage #:asdf-install-system 
-  (:use #:cl #:asdf))
-
-(in-package #:asdf-install-system)
-(require 'sb-executable)
-
-;;; this is appalling misuse of asdf.  please don't treat it as any
-;;; kind of example.  this shouldn't be a compile-op, or if it is, should
-;;; define output-files properly instead oif leaving it be the fasl
-(defclass exe-file (cl-source-file) ())
-(defmethod perform ((o compile-op) (c exe-file))
-  (call-next-method)
-  (sb-executable:make-executable
-   (make-pathname :name "asdf-install"
-		  :type nil
-		  :defaults (component-pathname c))
-   (output-files o c)
-   :initial-function "RUN"))
-
-(defmethod perform ((o load-op) (c exe-file)) nil)
-
 (defsystem asdf-install
   :depends-on (sb-posix sb-bsd-sockets)
+  #+sb-building-contrib :pathname
+  #+sb-building-contrib #p"SYS:CONTRIB;ASDF-INSTALL;"
   :version "0.2"
   :components ((:file "defpackage")
-	       (exe-file "loader")
-	       (:file "installer")))
-	       
-(defmethod perform :after ((o load-op) (c (eql (find-system :asdf-install))))
-  (provide 'asdf-install))
-
-(defmethod perform ((o test-op) (c (eql (find-system :asdf-install))))
-  t)
+               (:file "installer" :depends-on ("defpackage")))
+  :perform (load-op :after (o c) (provide 'asdf-install))
+  :perform (test-op (o c) t))